Merge the features branch into master, before stopping to use it #6716
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
Fixes pytest-dev#5991 Fixes pytest-dev#3823 Ref: pytest-dev/pytest-django#772 Ref: pytest-dev#1890 Ref: pytest-dev/pytest-django#782 - inject wrapped testMethod - adjust test_trial_error - add test for `--trace` with unittests
- Isolate logic for getting expected exceptions - Use original method name, as users see it when entering the debugger
Otherwise 'normal' failures won't call teardown explicitly
This feature was added in commit 007a77c, but was never used in pytest itself. A GitHub code search doesn't find any users either (only pytest repo copies). It seems safe to clean up.
minor: move internal _pformat_dispatch function
testing/python/metafunc.py: import _idval once
Fixes pytest-dev#759 - Adjust test_parametrized_ids_invalid_type, create list to convert tuples Ref: pytest-dev#1857 (comment) - Changelog for int to str conversion Ref: pytest-dev#1857 (comment)
Respect --fulltrace with collection errors
parametrized: ids: support generator/iterator
Add type annotations to _pytest.config.argparsing and corresponding Config code
…tures Merge master into features
Resolves pytest-dev#4445 and pytest-dev#5928 (thanks to allanlewis) Add CHANGELOG for location parameter
pytester: remove special handling of env during inner runs
…st-dev/pytest/pytest-dev#4445 Add acceptance tests for "config warnings" stacklevel (pytest-dev#4445)
Node from parent
_idval: remove trailing newline from exception
typing: minor improvements
Sets `PY_COLORS=0` in the environment by default, which is used by pylib. Via blueyed#58 (initially cherry picked from commit f153ad3)
pytester: use no colors with inline runs by default
Improve/extends tests.
`Generator` was removed in 7eb28f9, and this pleases mypy to correctly complain that `FunctionMixin` has no `config` (within `_prunetraceback`). * typing: _prunetraceback * minor: imports, typing
Every argname used in `parametrize` either must be declared explicitly in the python test function, or via `indirect` list Fix pytest-dev#5712
This started by looking at how to get the current test item in general, and then I noticed that it is not necessary for the capture plugin to track it manually in the first place.
Fix mypy errors: src/_pytest/runner.py:36: error: "addoption" of "OptionGroup" does not return a value [func-returns-value] src/_pytest/helpconfig.py:64: error: "addoption" of "OptionGroup" does not return a value [func-returns-value] src/_pytest/terminal.py:67: error: "_addoption" of "OptionGroup" does not return a value [func-returns-value] src/_pytest/terminal.py:75: error: "_addoption" of "OptionGroup" does not return a value [func-returns-value]
Not used since 4f0879f.
Remove unused field FixtureManager._arg2finish
Remove some redundant commas
This class was both added and became unused during the development of a PR: pytest-dev#3317
ExitCode is used in several internal modules and hooks and so with type annotations added, needs to be imported a lot. _pytest.main, being the entry point, generally sits at the top of the import tree. So, it's not great to have ExitCode defined in _pytest.main, because it will cause a lot of import cycles once type annotations are added (in fact there is already one, which this change removes). Move it to _pytest.config instead. _pytest.main still imports ExitCode, so importing from there still works, although external users should really be importing from `pytest`.
Remove unused NodeMarkers
Move ExitCode's definition from _pytest.main to _pytest.config
Conflicts: src/_pytest/main.py src/_pytest/mark/structures.py src/_pytest/python.py testing/test_main.py testing/test_parseopt.py
Merge master into features
* Use code highlighting if pygments is installed * Use colorama constants instead of bare ascii codes Could not find the exact equivalent of 'hl-reset' code using colorama constants though. * Refactor ASCII color handling into a fixture * Revert back to using explicit color codes * In Python 3.5 skip rest of tests that require ordered markup in colored output
The features branch is no more. Development of features is now also done on master. See pytest-dev#6571.
nicoddemus
approved these changes
Feb 12, 2020
|
Thanks! Just to make sure, was this a clean merge? |
|
The only conflict was the pytest/.github/workflows/main.yml Line 13 in 4209ad6 (and also one below). I resolved by removing it in the merge. |
|
Awesome, let's get this in then! 😁 |
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.
The features branch is no more. Development of features is now also done on master.
See #6571.