Browse Source

Revert "Pin setuptools<50 in our image venvs"

This reverts commit 6f992efbc5.

Setuptools 50.1.0 has been released which reverts the breaking behavior.
https://review.opendev.org/#/c/749766/ tests that these fixes work in
other venvs that exhibited the same problems. That change looks happy so
I think this revert is ready to go.

Change-Id: I31b62be4f85f40f4d99e463cd961dec0a3542f47
changes/77/749777/1
Clark Boylan 2 years ago
parent
commit
c6660ecfcb
  1. 3
      nodepool/elements/infra-package-needs/install.d/40-install-bindep
  2. 3
      nodepool/elements/infra-package-needs/install.d/40-install-tox
  3. 3
      nodepool/elements/nodepool-base/install.d/91-venv-os-testr

3
nodepool/elements/infra-package-needs/install.d/40-install-bindep

@ -23,7 +23,4 @@ fi
set -e
python3 -m venv /usr/bindep-env
# We do this first to ensure working setuptools is present when bindep
# is installed.
/usr/bindep-env/bin/pip install -U 'setuptools<50'
/usr/bindep-env/bin/pip install bindep

3
nodepool/elements/infra-package-needs/install.d/40-install-tox

@ -23,7 +23,4 @@ fi
set -e
python3 -m venv /usr/tox-env
# We do this first to ensure working setuptools is present when tox
# is installed.
/usr/tox-env/bin/pip install -U 'setuptools<50'
/usr/tox-env/bin/pip install tox

3
nodepool/elements/nodepool-base/install.d/91-venv-os-testr

@ -19,7 +19,4 @@ fi
set -e
python3 -m venv /usr/os-testr-env
# We do this first to ensure working setuptools is present when os-testr
# is installed.
/usr/os-testr-env/bin/pip install -U 'setuptools<50'
/usr/os-testr-env/bin/pip install os-testr

Loading…
Cancel
Save