Merge master into features#2163
Merged
nicoddemus merged 54 commits intopytest-dev:featuresfrom Dec 29, 2016
Merged
Conversation
Argparse driven argument type validation is added for the `--junit-xml` and `--confcutdir` arguments. The commit partially reverts pytest-dev#2080. Closes pytest-dev#2089.
Add `type` validation.
minor: fix grammar with help for --setup-{only,show}
Improved description of functionality for Issue pytest-dev#687
This code leaves None in sys.modules as a side effect but is no longer needed in the Python 3 versions we support. Fix pytest-dev#2103
Remove support code for earlier Python 3 version in Source.compile
Add warning for incorrect passing args to `-o`.
pytest would emit false positive warnings about assertion-rewrite when a module appears multiple times in plugins which depend on other plugins using the 'pytest_plugins' mechanism
…test-plugins Fix false-positive assert rewrite warnings when using 'pytest_plugins'
Remove hook proxy cache
Fix minor typo
…st.approx In Python 2 Fix pytest-dev#2111
Use a simple ``+-`` ASCII string in the string representation of pytest.approx In Python 2
Also update yield teardown for Issue pytest-dev#687
Add release dates to CHANGELOG entries
This avoids having to resort to skipping modules in conftest.py file and avoids flake8 errors
Setuptools is used in `_pytest/config.py` but was not explicitly listed as requirement. This led to an error when creating a Conda package for pytest since setuptools is not necessarily installed by default in Conda envs.
The error message contains the expected type of warnings and the warnings that were captured. Add tests.
following contribution guidelines
Mention that Python also adds CWD to sys.path using python -m
Fix fixture/parametrize override example.
…nfo-when-warns-fail Improve error message when pytest.warns fail
While I agree this is *far* from ideal, IMHO It is better to ignore them for now otherwise we hamper contributors with unrelated errors. We should fix this before the next release. pytest-dev#1989
…ains ::. This commit also improves readbility in get_dirs_from_args by using self documenting local functions. get_dirs_from_args also now only returns directories that actually exists, and not files to avoid confusion. This commit also removes redundant checks in get_common_ancestor that was already performed in get_dirs_from_args..
Those tests originally checked for ImportError. Since Python 3.6 ModuleNotFoundError is raised in this context instead, the tests didn't work as they are text based (so exception inheritance does not save the day). Fixes pytest-dev#2132
Partial fix for pytest-dev#2134
Fix handling of ini configuration in subdirs when specifying ::
Allow trial environments to fail on CI for now
Explicitly add setuptools to install_requires
Use inspect to properly detect generators. Fixes pytest-dev#2129
Tests: Check for ModuleNotFoundError on Python 3.6+
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.