-
Notifications
You must be signed in to change notification settings - Fork 23.7k
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
Restrict setuptools on Python 2 to make CI work again #66405
Closed
Closed
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
b732ee5
Restrict setuptools on Python 2 to make CI work again.
felixfontein 75f3d5e
Forgot quotes.
felixfontein dff0d29
Try different approach.
felixfontein 040c33f
Add explaining comments.
felixfontein 5b20ef1
Improve version check.
felixfontein 87d2620
Adjust line.
felixfontein File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
4 changes: 4 additions & 0 deletions
4
test/integration/targets/inventory_kubevirt_conformance/requirements.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
openshift | ||
|
||
# setuptools 45.0.0 no longer works with Python 2 | ||
setuptools<45.0.0 ; python_version < '3' | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,7 +9,7 @@ fi | |
set -eux | ||
|
||
source virtualenv.sh | ||
pip install openshift | ||
pip install -r requirements.txt | ||
|
||
./server.py & | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -496,7 +496,10 @@ | |||||
|
||||||
- name: install distribute in the virtualenv | ||||||
pip: | ||||||
name: distribute | ||||||
name: | ||||||
- distribute | ||||||
# setuptools 45.0.0 no longer works with Python 2 | ||||||
- setuptools<45.0.0 | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The task is contained in a block with |
||||||
virtualenv: "{{ output_dir }}/pipenv" | ||||||
state: present | ||||||
|
||||||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've updated the first line.
Why should
setuptools
also be specified for Python >= 3.0? The test needsopenshift
; I only addedsetuptools
because somewhere in the dependencies ofopenshift
, a newersetuptools
is mentioned than is currently installed.