Merge 2.7 #871
Merged
Merge 2.7 #871
Conversation
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
--HG-- branch : yield-experimental-docs
--HG-- branch : yield-experimental-docs
Kept a note about exceptions after yield not being reraised --HG-- branch : yield-experimental-docs
--HG-- branch : yield-experimental-docs
Reworded it a bit to bring it to par with the current status --HG-- branch : yield-experimental-docs
--HG-- branch : yield-experimental-docs
Removed note about yield fixtures being experimental
add a release checklist
These aren't quite complete but are a jolly good start anyway. It seems better to commit this now then leave it lingering until it gets lost.
Merged in pytest-2.7 (pull request pytest-dev#269).
fixed regression to 2.6.4 which surfaced e.g. in lost stdout capture printing
instead of prepending. This better allows to run test modules against installated versions of a package even if the package under test has the same import root. In this example:: testing/__init__.py testing/test_pkg_under_test.py pkg_under_test/ the tests will preferrably run against the installed version of pkg_under_test whereas before they would always pick up the local version. --HG-- branch : prefer_installed
--HG-- branch : pytester-inline-run-clean-sys-modules
, and call it from ``inline_run()`` to allow temporary modules to be reloaded. --HG-- branch : pytester-inline-run-clean-sys-modules
…dev#275) change test module importing behaviour to append to sys.path
Merged in schettino72/pytest/pytester-inline-run-clean-sys-modules (pull request pytest-dev#278).
This removes the drone.io badge from the README as it doesn't make sense to have it on the cheeseshop status page. Fixes issue pytest-dev#726.
--HG-- branch : plugin_no_pytest
…n and tests of plugin management to be a bit better split between pytest and pytest-independent bits --HG-- branch : plugin_no_pytest
--HG-- branch : plugin_no_pytest
…luginManager --HG-- branch : plugin_no_pytest
--HG-- branch : plugin_no_pytest
--HG-- branch : plugin_no_pytest
--HG-- branch : plugin_no_pytest
--HG-- branch : plugin_no_pytest
for the already existing cleanup logic of the config object. This simplifies lifecycle management as we don't keep two layers of shutdown functions and also simplifies the pluginmanager interface. also add some docstrings. --HG-- branch : plugin_no_pytest
fix issue 744 on bitbucket port of merge request 296 https://bitbucket.org/pytest-dev/pytest/pull-request/296/astcall-signature-changed-on-35 https://bitbucket.org/pytest-dev/pytest/issue/744/
Introduce tmpdir_factory session fixture
Support Python 3.5
Conflicts: _pytest/config.py _pytest/genscript.py _pytest/mark.py tox.ini
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
18 participants
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.
Just to make sure CI will pass