Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
4f10467
Remove now-duplicated PR titles from release PR descriptions
henrymercer Sep 15, 2022
82495d8
Add CHANGELOG note for TRAP caching
edoardopirovano Sep 16, 2022
b15cc00
Merge pull request #1251 from github/edoardo/trap-caching-changenote
edoardopirovano Sep 16, 2022
9f79e5f
Update changelog and version after v2.1.24
invalid-email-address Sep 16, 2022
e0ef82e
Update checked-in dependencies
invalid-email-address Sep 16, 2022
fb28913
Add advice to the backport PR on how to run the checks quicker
henrymercer Sep 16, 2022
2e9fbe3
Add advice to the mergeback PR on how to run the checks quicker
henrymercer Sep 16, 2022
aaca819
Merge pull request #1252 from github/mergeback/v2.1.24-to-main-904260d7
henrymercer Sep 16, 2022
5ffcfe9
python-setup: Allow newest `virtualenv`
RasmusWL Sep 16, 2022
e1ce6e3
python-setup: Fix venv creation in Ubuntu 22.04
RasmusWL Sep 19, 2022
70509c3
python-setup: Add support for Poetry 1.2
RasmusWL Sep 19, 2022
038242a
Merge pull request #1254 from github/henrymercer/improve-release-pr-d…
henrymercer Sep 20, 2022
1309aaf
Update CHANGELOG.md
RasmusWL Sep 20, 2022
c2c7bba
Merge pull request #1256 from github/rasmuswl/newer-virtualenv
RasmusWL Sep 21, 2022
3f97671
python-setup: run tests on Ubuntu 22.04
RasmusWL Sep 21, 2022
2264307
python-setup: change `env` passing
RasmusWL Sep 21, 2022
ca8a78d
python-setup: flush at the end of `_check_call`
RasmusWL Sep 21, 2022
417059f
Merge pull request #1258 from github/rasmuswl/poetry-v1.2
RasmusWL Sep 21, 2022
1fa5d72
python-setup: Fail early if installing for Python 2, and `python2` no…
RasmusWL Sep 21, 2022
93ba53f
add missing spaces
RasmusWL Sep 21, 2022
8a893dd
python-setup: Flush even more
RasmusWL Sep 21, 2022
b2fc1e1
python-setup: Disable python2 tests on ubuntu-22.04
RasmusWL Sep 21, 2022
32ca2cf
Apply suggestions from code review
RasmusWL Sep 21, 2022
ff5ca12
Merge pull request #1257 from github/rasmuswl/fix-ubuntu22.04-venv-cr…
henrymercer Sep 21, 2022
d1e2e02
Update changelog for v2.1.25
invalid-email-address Sep 21, 2022
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
Prev Previous commit
Next Next commit
python-setup: Fix venv creation in Ubuntu 22.04
Fixes #1249
  • Loading branch information
RasmusWL committed Sep 19, 2022
commit e1ce6e3115eb3941ade27ef009d1245e4b0b74f1
8 changes: 6 additions & 2 deletions python-setup/install_tools.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
#! /usr/bin/pwsh

py -2 -m pip install --user --upgrade pip setuptools wheel
py -3 -m pip install --user --upgrade pip setuptools wheel
# while waiting for the next release of `virtualenv` after v20.16.5, we install an older
# version of `setuptools` to ensure that binaries are always put under
# `<venv-path>/bin`, which wouldn't always happen with the GitHub actions version of
# Ubuntu 22.04. See https://github.com/github/codeql-action/issues/1249
py -2 -m pip install --user --upgrade pip 'setuptools<60' wheel
py -3 -m pip install --user --upgrade pip 'setuptools<60' wheel

# virtualenv is a bit nicer for setting up virtual environment, since it will provide up-to-date versions of
# pip/setuptools/wheel which basic `python3 -m venv venv` won't
Expand Down
10 changes: 8 additions & 2 deletions python-setup/install_tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,13 @@ set -e
export PATH="$HOME/.local/bin:$PATH"

# Setup Python 3 dependency installation tools.
python3 -m pip install --user --upgrade pip setuptools wheel

# we install an older version of `setuptools` to ensure that binaries are always put
# under `<venv-path>/bin`, which wouldn't always happen with the GitHub actions version
# of Ubuntu 22.04. See https://github.com/github/codeql-action/issues/1249. The the next
# release of `virtualenv` after v20.16.5 will include a fix for this, so we can remove
# this bit of the logic again.
python3 -m pip install --user --upgrade pip 'setuptools<60' wheel

# virtualenv is a bit nicer for setting up virtual environment, since it will provide up-to-date versions of
# pip/setuptools/wheel which basic `python3 -m venv venv` won't
Expand Down Expand Up @@ -40,7 +46,7 @@ if command -v python2 >/dev/null 2>&1; then
curl --location --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2
fi

python2 -m pip install --user --upgrade pip setuptools wheel
python2 -m pip install --user --upgrade pip 'setuptools<60' wheel

python2 -m pip install --user 'virtualenv<20.11'
fi