Skip to content

Merge releases/v2 into releases/v1 #1264

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.

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 31 commits into from
Sep 22, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 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
86f3159
Merge pull request #1261 from github/update-v2.1.25-ff5ca122
henrymercer Sep 21, 2022
d4e6145
Revert "Update version and changelog for v1.1.24"
invalid-email-address Sep 21, 2022
63e162a
Revert "Update checked-in dependencies"
invalid-email-address Sep 21, 2022
7b13a3f
Merge remote-tracking branch 'origin/releases/v2' into update-v1.1.25…
invalid-email-address Sep 21, 2022
e4a1505
Update version and changelog for v1.1.25
invalid-email-address Sep 21, 2022
b27be7b
Update checked-in dependencies
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: Allow newest virtualenv
Context for previous version is
#862

Locally, I was able to install `20.15.1` with Python2.

I don't see any reason why python3 version should be restricted.
  • Loading branch information
RasmusWL committed Sep 16, 2022
commit 5ffcfe95cc5ed5bae75ebdc037fff41b5b216e3c
4 changes: 2 additions & 2 deletions python-setup/install_tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ py -3 -m pip install --user --upgrade pip setuptools 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
py -2 -m pip install --user 'virtualenv<20.11'
py -3 -m pip install --user 'virtualenv<20.11'
py -2 -m pip install --user 'virtualenv!=20.12.0'
py -3 -m pip install --user virtualenv

# We aren't compatible with poetry 1.2
py -3 -m pip install --user "poetry>=1.1,<1.2"
Expand Down
4 changes: 2 additions & 2 deletions python-setup/install_tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ python3 -m pip install --user --upgrade pip setuptools 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
python3 -m pip install --user 'virtualenv<20.11'
python3 -m pip install --user virtualenv

# We install poetry with pip instead of the recommended way, since the recommended way
# caused some problem since `poetry run` gives output like:
Expand All @@ -42,5 +42,5 @@ if command -v python2 >/dev/null 2>&1; then

python2 -m pip install --user --upgrade pip setuptools wheel

python2 -m pip install --user 'virtualenv<20.11'
python2 -m pip install --user 'virtualenv!=20.12.0'
fi
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy