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

Cap pytest to below 3.0 (rebased onto metadata52) #4858

Merged
merged 3 commits into from
Sep 22, 2016
Merged

Cap pytest to below 3.0 (rebased onto metadata52) #4858

merged 3 commits into from
Sep 22, 2016

Conversation

atarkowska
Copy link
Member

This is the same as gh-4826 but rebased onto metadata52.


What this PR does

This PR caps the pytest version to below 3.0.0 due to the bug at: pytest-dev/pytest#1905

Testing this PR

The test previously failing at https://ci.openmicroscopy.org/view/Failing/job/OMERO-DEV-breaking-integration-Python27/26/testReport/OmeroPy.test.integration.clitest/test_download/TestDownload/ should pass.

When the issue above if resolved the commit in this PR should be reverted or otherwise amended.

See: https://trello.com/c/FjmLqCum/709-uncap-pytest

--rebased-to #4848

@atarkowska
Copy link
Member Author

--rebased-from #4826

@joshmoore
Copy link
Member

Confirmed on 10.*150. Thanks, @aleksandra-tarkowska

@joshmoore joshmoore merged commit 83b1e83 into ome:metadata52 Sep 22, 2016
@joshmoore joshmoore deleted the rebased/metadata52/cap-pytest branch September 22, 2016 20:32
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