Merge master into features #5522
Merged
Conversation
This file contains 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
…ytest-dev#5360)" This reverts commit 733f43b, reversing changes made to e4fe41e.
Revert unrolling of `all()`
This reverts commit a6dc283.
Revert "Revert "ci: Travis: add pypy3 to allowed failures temporarily""
…pytest-dev#5231) Add a new Exceptions section in documentation and document UsageError
Preparing release version 4.6.2
…ase-4.6.2 (pytest-dev#5380) [release notes] Merge pull request pytest-dev#5379 from asottile/release-4.6.2
…t-dev#5378) Revert "ci: Travis: add pypy3 to allowed failures temporarily"
… dictionaries (pytest-dev#5315) Documentation: expansion of Monkeypatch to include mocked classes and dictionaries
Looks like this has been in the history since the beginning of time, but we should always get a blank slate anyway Noticed this in arrow-py/arrow#597
Remove --recreate from .travis.yml
Related to pytest-dev#5317
Allow pypy3 failures again
fix logic if importlib_metadata.PathDistribution.files is None [breaks pytest 4.6.0|1|2]
item.obj is again a bound method on TestCase function items
Use keyword-only arguments in a few places
Clean up u' prefixes and py2 bytes conversions
Without this, `testing/test_pdb.py` (already without pexpect) will cause missing test coverage afterwards (for the same process).
Small optimization, move the generation of the intermediate formatting variables inside the 'if _check_if_assertion_pass_impl():' block.
…enames Deprecate funcargnames alias for fixturenames
Features assertion pass hook
Remove py<35 compatibility code from rewrite.py
Add Open Collective to FUNDING.yml
…est-dev#5503) Don't crash with --pyargs and a filename that looks like a module
Fix crash when discovery fails while using `-p no:terminal`
Remove stray comment from tox.ini
…dev#5512) Remove astor and reproduce the original assertion expression
Refactoring doctests
Preparing release version 5.0.0
Preparing release version 4.6.4
…nce-release 4.6.4 changelog notes
Codecov Report
@@ Coverage Diff @@
## features #5522 +/- ##
=============================================
+ Coverage 83.14% 96.11% +12.97%
=============================================
Files 114 117 +3
Lines 25528 25695 +167
Branches 2482 2493 +11
=============================================
+ Hits 21224 24696 +3472
+ Misses 3915 695 -3220
+ Partials 389 304 -85
Continue to review full report at Codecov.
|
asottile
approved these changes
Jun 29, 2019
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.
And now we're back to having separate
masterandfeaturesfor 5.x. 😁