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

Fix 3.9 for Multiarch #34

Merged
merged 7 commits into from
Jan 9, 2020
Merged

Fix 3.9 for Multiarch #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
60dd012
Remove obsolete switch
native-api Jan 5, 2020
06ab266
Use latest virtualenv
native-api Jan 5, 2020
512ab75
Show all build output to see potential problems
native-api Jan 5, 2020
a54e662
Python 2 is EOL and will likely not receive further Virtualenv updates
native-api Jan 5, 2020
95e9784
Don't install optional modules for prerelease versions
native-api Jan 5, 2020
cab8aa3
Merge branch 'default' into fix-3.9
native-api Jan 7, 2020
f9472fe
Fix 3.9 for multiarch
native-api Jan 7, 2020
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
26 changes: 23 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ jobs:
language: minimal
- arch: s390x
dist: xenial
name: xenial-ppc64le
name: xenial-s390x
os: linux
language: minimal
- arch: s390x
dist: bionic
name: bionic-ppc64le
name: bionic-s390x
os: linux
language: minimal
- arch: arm64
Expand All @@ -53,6 +53,9 @@ jobs:
name: bionic-arm64
language: minimal

allow_failures:
- name: xenial-arm64

env:
global:
- VERSION=3.8-dev
Expand All @@ -63,7 +66,24 @@ install:
- sudo git checkout master
- sudo git pull
- popd
- sudo python3 -m pip install --upgrade virtualenv
# As of this writing:
# * Py2 is EOL
# * however, pip (https://pip.pypa.io/en/latest/development/release-process/#python-2-support) intends to keep supporting it as long as practical
# * Virtualenv also supports old versions (e.g. 3.4) far longer than PSF does
# * selected images have `virtualenv` on PATH for stem Py2 preinstalled (installed with pip); for amd64 globally, for multiarch per user
# * this preinstalled `virtualenv` doesn't support 3.9+
# * selected amd64 images have 3.7.* preinstalled with pip; multiarch have pyenv not on PATH, with no alt versions
# * xenial's provided Py3, 3.5, is in security fixes mode, due for EOL in 06.2020
#
# So it seems to be safe to use the py2 preinstalled `virtualenv` if we update it, for the foreseeable future.
# FIXME: use an officially supported alt Python version for `virtualenv` instead once one is available in all images.
- |
# `cat` avoids "broken pipe"; `freeze` instead of `list` avoids a warning about future output format change
if (python -m pip freeze --user | cat | grep -qP '^virtualenv=='); then
python -m pip install --upgrade --user virtualenv
elif (python -m pip freeze | cat | grep -qP '^virtualenv=='); then
sudo python -m pip install --upgrade virtualenv
fi

before_script:
- 'export INSTALL_DEST=${INSTALL_DEST:-/opt/python}'
Expand Down
2 changes: 1 addition & 1 deletion bin/compile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ if [[ $PACKAGES ]] ; then
$HOME/virtualenv/$VIRTENV_VERSION/bin/pip install --upgrade $PACKAGES
fi

if ! [[ "${ALIAS}" == nightly || "${VERSION}" =~ '-dev$' ]]; then
if ! [[ "${ALIAS}" == nightly || "${VERSION}" =~ -dev$ ]]; then
if [[ ${VERSION} == pypy* ]]; then
$HOME/virtualenv/$VIRTENV_VERSION/bin/${PYTHON_BIN} -m ensurepip
fi
Expand Down