Skip to content

Extend log patterns #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 12, 2015
Merged

Extend log patterns #100

merged 5 commits into from
Oct 12, 2015

Conversation

The-Compiler
Copy link
Member

There are actually a few unrelated changes in here, but I hope you don't mind (at least they have their own commits 😉).

  • Fix test_logging_fails_ignore_mark.
  • Add extend keyword argument to qt_log_ignore mark.
  • Validate qt_log_ignore keyword arguments.
  • Remove unneeded imports.
  • Add .cache and .venv to .gitignore.

@nicoddemus
Copy link
Member

I don't mind at all, thanks for the PR Florian! 😄

I'm investigating the errors on py27 on Windows.

@The-Compiler
Copy link
Member Author

The ones on Linux are because coverage 4.0 doesn't support Python 3.2 anymore - maybe it's time to drop 3.2 support too?

@nicoddemus
Copy link
Member

Yeah, the only problem is that Qt4 is available on 3.2 only on the Ubuntu version supported by Travis... I have to find some time and investigate how to get around that. 😑

@The-Compiler
Copy link
Member Author

Oh, right, reminds me of #96 - one possibility would probably be to use tox on Travis too, with the link_pyqt script. I hope I get time to take a look later today.

@nicoddemus
Copy link
Member

The failures on Windows are not related to this change... I will have to fix that on pytest itself.

nicoddemus added a commit that referenced this pull request Oct 12, 2015
@nicoddemus nicoddemus merged commit 117d083 into pytest-dev:master Oct 12, 2015
@nicoddemus
Copy link
Member

Opened pytest-dev/pytest#1133 to discuss how to properly solve this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants