Skip to content

Merge master into features #6537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 66 commits into from
Jan 22, 2020
Merged

Merge master into features #6537

merged 66 commits into from
Jan 22, 2020

Conversation

nicoddemus
Copy link
Member

Conflicts:

  • src/_pytest/_code/code.py
  • src/_pytest/main.py
  • testing/python/metafunc.py
  • testing/test_parseopt.py
  • testing/test_pytester.py

blueyed and others added 30 commits January 11, 2020 23:05
Somehow in Python 3.5 on Windows this test fails with:
   File "c:\hostedtoolcache\windows\python\3.5.4\x64\Lib\multiprocessing\connection.py", line 302, in _recv_bytes
     overlapped=True)
OSError: [WinError 6] The handle is invalid

This only happens in this platform and Python version, decided to use
a dummy traceback as originally done in pytest-dev#6412.

(cherry picked from commit b9c136b)
[master] Use a dummy RemoteTraceback for test in Python 3.5 Windows
GitHub actions already should deploy.

This is a stop gap while we figure out why coverage dropped
when removing Travis builds in pytest-dev#6470
Drop deploy from Travis in favor of GitHub actions
pytester: typing for `spawn`/`spawn_pytest`
tests: test_xfail_handling: use sys.dont_write_bytecode
Fix test_config: wrong assertions, lint, unused fixtures
typing: Node.reportinfo: might return py.path.local via fspath
tests: fix test_crash_on_closing_tmpfile_py27
This helps with regard to slowness until
pytest-dev#6470 is resolved.
ci: Travis: remove non-coverage jobs
blueyed and others added 27 commits January 19, 2020 11:33
typing: fix some "incompatible types in assignment" with py
Fix type errors after adding types to the `py` dependency
Also replace one direct call to `compile` with this flag with the
equivalent wrapper `ast.parse`. This function can have a more precise
type.
These are more "dirty" than the previous batch (that's why they were
left out). The trouble is that `compile` can return either a code object
or an AST depending on a flag, so we need to add an overload to make the
common case Union free. But it's still worthwhile.
Some type annotation & check_untyped_defs fixes
…est-dev#6496)

Revert "fixtures register finalizers with all fixtures before them in the stack"
Preparing release version 5.3.4
This reverts commit 930a158.

Regression test from Bruno Oliveira.
…egression

Fix internal assert failure regression in 5.3.4
Following jobs get aborted on failure.

Ref: pytest-dev#6530
ci: GHA: remove unnecessary check for `success()`
--cache-clear: add test for keeping non-supporting files
This allows for `tox -e doctesting-coverage`, which would otherwise not
use the "doctesting" testenv.
tox: move doctesting into main testenv
Conflicts:
 * 	src/_pytest/_code/code.py
 * 	src/_pytest/main.py
 * 	testing/python/metafunc.py
 * 	testing/test_parseopt.py
 * 	testing/test_pytester.py
@nicoddemus nicoddemus merged commit 0bf9628 into pytest-dev:features Jan 22, 2020
@nicoddemus nicoddemus deleted the mm branch January 22, 2020 15:43
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.

3 participants