Skip to content

Merge master into features #6457

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

Closed
wants to merge 10 commits into from

Conversation

blueyed
Copy link
Contributor

@blueyed blueyed commented Jan 14, 2020

No description provided.

blueyed and others added 10 commits January 12, 2020 20:09
(cherry picked from commit 16ff9f5)
(cherry picked from commit 4848bbd)
typing: fix _pytest.config.findpaths.determine_setup
Python 3.5.0 caused flaky failures before
(pytest-dev#5795).

This is pulled out of pytest-dev#6435,
which adds code specific for Python < 3.5.2.

It only runs a specific test, while collecting everything to get
coverage of the version specific code around typing.
ci: Travis: Python 3.5.1 via Trusty
Conflicts:
	src/_pytest/compat.py
@blueyed blueyed closed this Jan 14, 2020
@blueyed blueyed deleted the merge-master-into-features branch January 14, 2020 12:21
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.

2 participants