Skip to content

Upgrade venv and pip #684

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

Merged
merged 9 commits into from
Mar 16, 2021
Merged

Upgrade venv and pip #684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bfd15f7
Initial updates on build for updated pip/venv
amanda11 Jan 27, 2021
3d2f470
Update accidentally checked in file
amanda11 Jan 28, 2021
c448cb0
Tidy-up
amanda11 Jan 28, 2021
8f9eef1
Downgrade pip to 20.3.3
amanda11 Jan 29, 2021
76c9352
Set DH_VIRTUALENV_ARGUUMENTS
amanda11 Feb 1, 2021
3218c0b
Use copies
amanda11 Feb 12, 2021
53c79a0
Merge branch 'master' into upgrade_venv
amanda11 Mar 11, 2021
2239edd
Update virtualenv args
amanda11 Mar 11, 2021
2a89445
Add support for upgrade-pip-to flag
amanda11 Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/st2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ wheelhouse: .build-runners .stamp-wheelhouse
.stamp-wheelhouse: | populate_version requirements inject-deps
cat requirements.txt
# Try to install wheels 2x in case the first one fails
$(PIP_BINARY) wheel --wheel-dir=$(WHEELDIR) --find-links=$(WHEELDIR) -r requirements.txt || \
$(PIP_BINARY) wheel --wheel-dir=$(WHEELDIR) --find-links=$(WHEELDIR) -r requirements.txt
$(PIP_BINARY) --use-deprecated=legacy-resolver wheel --wheel-dir=$(WHEELDIR) --find-links=$(WHEELDIR) -r requirements.txt || \
$(PIP_BINARY) --use-deprecated=legacy-resolver wheel --wheel-dir=$(WHEELDIR) --find-links=$(WHEELDIR) -r requirements.txt
touch $@

.build-runners:
Expand Down
4 changes: 2 additions & 2 deletions packages/st2/component.makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ wheelhouse: .stamp-wheelhouse
# Install wheels into shared location
cat requirements.txt
# Try to install wheels 2x in case the first one fails
$(PIP_BINARY) wheel --wheel-dir=$(WHEELDIR) --find-links=$(WHEELDIR) -r requirements.txt || \
$(PIP_BINARY) wheel --wheel-dir=$(WHEELDIR) --find-links=$(WHEELDIR) -r requirements.txt
$(PIP_BINARY) --use-deprecated=legacy-resolver wheel --wheel-dir=$(WHEELDIR) --find-links=$(WHEELDIR) -r requirements.txt || \
$(PIP_BINARY) --use-deprecated=legacy-resolver wheel --wheel-dir=$(WHEELDIR) --find-links=$(WHEELDIR) -r requirements.txt
touch $@

bdist_wheel: .stamp-bdist_wheel
Expand Down
10 changes: 6 additions & 4 deletions packages/st2/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ PATH = /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
WHEELDIR ?= /tmp/wheelhouse
DH_VIRTUALENV_INSTALL_ROOT := /opt/stackstorm
export DH_VIRTUALENV_INSTALL_ROOT
PIP_VERSION = 20.3.3

IS_SYSTEMD = $(shell command -v dh_systemd_enable > /dev/null 2>&1 && echo true)
DEB_DISTRO := $(shell lsb_release -cs)
Expand Down Expand Up @@ -67,10 +68,11 @@ override_dh_virtualenv:
#
# NB! Use '--no-download' arg for 'virtualenv' is required,
# otherwise it downloads latest PIP version instead of bundled/pinned one.
# --force-pip-version is needed to ensure correct pip version is installed
# inside dh virtualenv
dh_virtualenv --extra-virtualenv-arg='--no-download' \
--force-pip-version='20.0.2' \
# NB! Use '--copies' else /opt/stackstorm/st2/bin/python is symlink to
# /usr/bin/pythonx rather than copy - and this breaks pack install
# which follows the path to calculate the location of the bin directory
dh_virtualenv --extra-virtualenv-arg='--copies' --extra-virtualenv-arg='--no-download' \
'--upgrade-pip-to=$(PIP_VERSION)' \
--extra-pip-arg '--find-links=$(WHEELDIR)' \
--extra-pip-arg '--no-index' --no-test

Expand Down
4 changes: 2 additions & 2 deletions rpmspec/package_venv.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

%define venv_python %{venv_bin}/python3
# https://github.com/StackStorm/st2/wiki/Where-all-to-update-pip-and-or-virtualenv
%define pin_pip %{venv_python} %{venv_bin}/pip3 install pip==20.0.2
%define pin_pip %{venv_python} %{venv_bin}/pip3 install pip==20.3.3
%define install_venvctrl python3 -m pip install venvctrl
%if 0%{?rhel} == 8
%define install_crypto %{venv_python} %{venv_bin}/pip install cryptography==2.8 --no-binary cryptography
Expand All @@ -28,7 +28,7 @@
virtualenv-3 -p python3 --no-download %{venv_dir} \
%{pin_pip} \
%{install_crypto} \
%{venv_pip} -r requirements.txt \
%{venv_pip} --use-deprecated=legacy-resolver -r requirements.txt \
%{venv_pip} . \
%{install_venvctrl} \
venvctrl-relocate --source=%{venv_dir} --destination=/%{venv_install_dir} \
Expand Down