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

Restrict setuptools on Python 2 to make CI work again #66405

Closed
wants to merge 6 commits into from
Closed

Restrict setuptools on Python 2 to make CI work again #66405

Show file tree
Hide file tree
Changes from all 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 Jan 13, 2020
75f3d5e
Forgot quotes.
felixfontein Jan 13, 2020
dff0d29
Try different approach.
felixfontein Jan 13, 2020
040c33f
Add explaining comments.
felixfontein Jan 13, 2020
5b20ef1
Improve version check.
felixfontein Jan 13, 2020
87d2620
Adjust line.
felixfontein Jan 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions test/integration/targets/inventory_kubevirt_conformance/requirements.txt
View file
Open in desktop
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 ; python_version < "3.0"
2 changes: 1 addition & 1 deletion test/integration/targets/inventory_kubevirt_conformance/runme.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ fi
set -eux

source virtualenv.sh
pip install openshift
pip install -r requirements.txt

./server.py &

Expand Down
5 changes: 4 additions & 1 deletion test/integration/targets/pip/tasks/pip.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
- setuptools<45.0.0
- setuptools<45; python_version < "3.0"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The task is contained in a block with when: ansible_python.version.major == 2.

virtualenv: "{{ output_dir }}/pipenv"
state: present

Expand Down