Skip to content

Merge master into features#2163

Merged
nicoddemus merged 54 commits intopytest-dev:featuresfrom
nicoddemus:merge-master-into-features
Dec 29, 2016
Merged

Merge master into features#2163
nicoddemus merged 54 commits intopytest-dev:featuresfrom
nicoddemus:merge-master-into-features

Conversation

@nicoddemus
Copy link
Copy Markdown
Member

No description provided.

decentral1se and others added 30 commits November 28, 2016 02:16
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.
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'
Use a simple ``+-`` ASCII string in the string representation of pytest.approx In Python 2
nicoddemus and others added 24 commits December 10, 2016 16:55
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
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+
@coveralls
Copy link
Copy Markdown

Coverage Status

Coverage increased (+0.007%) to 92.689% when pulling 402fbe5 on nicoddemus:merge-master-into-features into 669332b on pytest-dev:features.

@nicoddemus nicoddemus merged commit 964ccb9 into pytest-dev:features Dec 29, 2016
@nicoddemus nicoddemus deleted the merge-master-into-features branch December 29, 2016 00:21
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.