Merge the features branch to master, before deleting features#6642
Closed
bluetech wants to merge 128 commits intopytest-dev:masterfrom
Closed
Merge the features branch to master, before deleting features#6642bluetech wants to merge 128 commits intopytest-dev:masterfrom
bluetech wants to merge 128 commits intopytest-dev:masterfrom
Conversation
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
…tures Merge master into features
Clear node collection cache after collection is done
Conflicts: src/_pytest/_code/code.py src/_pytest/main.py
…tures Merge master into features
Previously, _initialparts was a list whose first item was a `py.path.local` and the rest were `str`s. This is not something that mypy is capable of modeling. The type `List[Union[str, py.path.local]]` is too broad and would require asserts for every access. Instead, make each item a `Tuple[py.path.local, List[str]]`. This way the structure is clear and the types are accurate. To make sure any users who might have been accessing this (private) field will not break silently, change the name to _initial_parts.
Refactor Session._initialparts to have a more explicit type
Previously, this cache was used with 3 different and mutually exclusive key-type -> value-type combinations. Mypy can't properly type this. It's also quite confusing. Split to 3 different dicts instead.
…tures Merge master into features
…tures Merge master into features
Split Session._collection_node_cache to 3 mutually exclusive parts
Adds handling of `N` to reset `reportchars`, which can be used to get the old behavior (`-rN`), and also allows for an alternative to `--disable-warnings` (pytest-dev#5066), since `w` was included by default (without `--disable-warnings`). Fixes pytest-dev#6454
terminal: default to `fE` with `-r` (reportchars)
…tures Merge master into features
…rize_nodeid Fix node ids which contain a parametrized empty-string variable
Fix 6341 disallow session config in fromparent
…tures Merge master into features
Merge master to features - one last time
Member
Author
|
Pending decision on @blueyed's concern in #6571 (comment). |
bluetech
force-pushed
the
features-to-master
branch
from
39b237f to
21b1c1b
Compare
blueyed
suggested changes
Jan 31, 2020
Contributor
blueyed
left a comment
blueyed
left a comment
There was a problem hiding this comment.
Just to express my concern I am requesting changes (#6571 (comment)).
This can be overruled of course, but I will certainly not approve it myself.
Contributor
|
@bluetech I think this is not really necessary for the transition anyway, but only before the next release, isn't it? |
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
10 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.
Part of #6571 transition plan. This step merges
featuresintomaster, after which thefeaturesbranch will be deleted.