Skip to content

Merge master into features #4301

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

Conversation

nicoddemus
Copy link
Member

No description provided.

Bernardoow and others added 30 commits October 27, 2018 14:31
…_pytest-datadir

changed address to pytest-data-dir
Fixes pytest-dev#4255 by adding to the doc that module names are not regex-escaped
…warning

Swallow warnings during anonymous compilation of source
Fix access denied error when deleting a stale temporary directory
this avoid triggering the warnings when parsing the session node as session plugin
…ion-attributes

don`t parse compat properties as fixtures
Added the slides of a PyconES 2017 talk about pytest and its plugins ecosystem.
Upgrade pyupgrade for crlf fixes (again)
corrected the target name
asottile and others added 19 commits November 1, 2018 08:40
This removes the hack added in pytest-dev#3802.

Adjusts test:

- it appears to not have been changed to 7 intentionally.
- removes XXX comment, likely not relevant anymore since 6dac774.
python: collect: ignore exceptions with isinstance
Improve the warning message for the implicitly str conversion
Fix problems with running tests in package `__init__` files (pytest-dev#4046)
This is relevant when using runpytest in-process.

Fixes:

E             def test_1(testdir):
E                 testdir.runpytest()
E         >       __import__('pdb').set_trace()
E
E         ../../test_trace_after_runpytest.py:3:
E         …/Vcs/pytest/src/_pytest/debugging.py:81: in set_trace
E             tw = _pytest.config.create_terminal_writer(cls._config)
E
E         config = None, args = (), kwargs = {}, tw = <py._io.terminalwriter.TerminalWriter object at 0x7f1097088160>
E
E             def create_terminal_writer(config, *args, **kwargs):
E                 """Create a TerminalWriter instance configured according to the options
E                 in the config object. Every code which requires a TerminalWriter object
E                 and has access to a config object should use this function.
E                 """
E                 tw = py.io.TerminalWriter(*args, **kwargs)
E         >       if config.option.color == "yes":
E         E       AttributeError: 'NoneType' object has no attribute 'option'
debugging: make pytest_configure re-entrant
Remove last step, because it was merged already before (changed in
77cad3c).

[ci skip]
@RonnyPfannschmidt
Copy link
Member

the appveyor failure seems neglect able for this pr

@RonnyPfannschmidt RonnyPfannschmidt merged commit 5eb4016 into pytest-dev:features Nov 4, 2018
@nicoddemus nicoddemus deleted the merge-master-into-features branch November 4, 2018 23:20
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.