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.

Sign up for GitHub

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

Jump to bottom

Cap pytest to below 3.0 (rebased) #4848

Merged
merged 3 commits into from
Sep 30, 2016
Merged

Cap pytest to below 3.0 (rebased) #4848

merged 3 commits into from
Sep 30, 2016

Conversation

ximenesuk
Copy link
Contributor

@ximenesuk ximenesuk commented Sep 16, 2016 •
edited
Loading

This is a rebase of gh-4826 to fix the same problem caused by pytest. See that PR for more details.

--rebased-from #4826

@jburel
Copy link
Member

jburel commented Sep 16, 2016

Problem on dev_5_2
w/o this PR
https://10.0.51.137:8443/job/OMERO-test-integration/2/testReport/OmeroPy.test.integration.clitest/test_download/TestDownload/

@ximenesuk ximenesuk mentioned this pull request Sep 16, 2016
Merged
@jburel jburel added the dev_5_2 label Sep 19, 2016
@jburel
Copy link
Member

jburel commented Sep 19, 2016

https://10.0.51.137:8443/job/OMERO-test-integration/lastCompletedBuild/testReport/
no failure with this PR

@atarkowska atarkowska mentioned this pull request Sep 22, 2016
Merged
@jburel jburel merged commit 90eb650 into ome:dev_5_2 Sep 30, 2016
@jburel jburel modified the milestone: 5.2.6 Oct 4, 2016
@jburel jburel modified the milestones: 5.3.0, 5.2.6 Mar 29, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
dev_5_2
Projects
None yet
Milestone
5.3.0
Development

Successfully merging this pull request may close these issues.
2 participants
@ximenesuk @jburel