Skip to content

Commit

Permalink
Avoid setuptools 60.6.0
Browse files Browse the repository at this point in the history
It has a bug (see github.com/pypa/setuptools/issues/3063).
  • Loading branch information
manthey committed Feb 1, 2022
1 parent ce62517 commit 054b138
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
3 changes: 2 additions & 1 deletion ansible/Dockerfile-girder
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,11 @@ RUN sudo apt-get update && \
&& \
sudo rm -rf /var/lib/apt/lists/* /tmp/*
RUN curl --silent https://bootstrap.pypa.io/get-pip.py -O && \
SETUPTOOLS_USE_DISTUTILS=stdlib python3.6 get-pip.py && \
SETUPTOOLS_USE_DISTUTILS=stdlib python3.7 get-pip.py && \
SETUPTOOLS_USE_DISTUTILS=stdlib python3.8 get-pip.py && \
SETUPTOOLS_USE_DISTUTILS=stdlib python3.9 get-pip.py && \
curl --silent https://bootstrap.pypa.io/pip/3.6/get-pip.py -O && \
SETUPTOOLS_USE_DISTUTILS=stdlib python3.6 get-pip.py && \
rm get-pip.py && \
sudo find / -xdev -name '*.py[oc]' -type f -exec rm {} \+ && \
sudo find / -xdev -name __pycache__ -type d -exec rm -r {} \+
Expand Down
7 changes: 7 additions & 0 deletions ansible/roles/common/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
---
- name: Get the most recent version of pip
pip:
name:
- pip
- 'setuptools<60.6.0'
extra_args: -U

- name: Ensure the girder group exists
group:
name: "{{ girder_exec_group }}"
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/girder/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pip:
name:
- pip
- setuptools
- 'setuptools<60.6.0'
extra_args: -U
virtualenv: "{{ girder_virtualenv }}"
# Implicitly create a Python 3 virtualenv if it doesn't exist
Expand Down

0 comments on commit 054b138

Please sign in to comment.