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

OMERO-test-integration pin pytest-xdist<2 #169

Merged
merged 4 commits into from Aug 19, 2020
Merged

OMERO-test-integration pin pytest-xdist<2 #169

merged 4 commits into from Aug 19, 2020

Conversation

manics
Copy link
Member

@manics manics commented Aug 17, 2020 •
edited

This prevents psutil being installed. See pytest-dev/pytest-xdist#585

Note this also contains other changes that were previously made to the job but weren't added here.

@manics
merge-ci OMERO-test-integration/config.xml 2020-08-17
7650b60 
This is a verbatim copy of home/jobs/OMERO-test-integration/config.xml from merge-ci on 2020-08-17
@manics
Pin psutil<2 to avoid psutil dependency
0710367 
See pytest-dev/pytest-xdist#585
@sbesson
Copy link
Member

sbesson commented Aug 18, 2020

The changes make sense and https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-test-integration/493/ built without issues with it included today.

https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-training/478/console seems to be failing due to the same issue with pytest-xsdist. Do you want to apply the same workaround and add the commits to this PR?

@joshmoore joshmoore mentioned this pull request Aug 18, 2020
Merged
@manics
merge-ci OMERO-training/config.xml 2020-08-18
2fde355 
This is a verbatim copy of home/jobs/OMERO-training/config.xml from merge-ci on 2020-08-18
@manics
OMERO-training: Pin psutil<2 to avoid psutil dependency
f57666c
@sbesson sbesson mentioned this pull request Aug 18, 2020
Merged
sbesson
sbesson approved these changes Aug 19, 2020
View reviewed changes
Copy link
Member

@sbesson sbesson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes make sense, have been successfully tested in the jobs on https://merge-ci.openmicroscopy.org/jenkins and go in the direction of creating fresh virtual environments on each execution. Merging, tagging as 0.15.2 and I will propagate to latest-ci.

@sbesson sbesson merged commit 2c31e94 into ome:master Aug 19, 2020
@sbesson
Copy link
Member

sbesson commented Aug 19, 2020

0.15.2 now merged into latest-ci. I will review these changes do not destabilize the jobs tomorrow.

@sbesson
Copy link
Member

sbesson commented Aug 19, 2020

Also merged 0.15.2 into merge-ci and reloading the configuration from disk after fixing various merge conflicts. I will open a few PRs backporting some of the recent changes.

@sbesson sbesson mentioned this pull request Aug 19, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbesson sbesson sbesson approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@manics @sbesson