Skip to content
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

[5.4] Merge pull request #7179 from asottile/py39 #7188

Merged
merged 1 commit into from May 8, 2020
Merged

[5.4] Merge pull request #7179 from asottile/py39 #7188

merged 1 commit into from May 8, 2020

Conversation

asottile
Copy link
Member

@asottile asottile commented May 7, 2020

No description provided.

@asottile
Copy link
Member Author

asottile commented May 7, 2020

this one required a manual resolution where I dropped the pypy line in tox.ini since 5.4.x does not support python 2

@nicoddemus nicoddemus merged commit 25b53c4 into pytest-dev:5.4.x May 8, 2020
@asottile asottile deleted the backport_7179 branch May 24, 2020 03:10
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.

None yet

3 participants