Skip to content

Commit 7ed6fa9

Browse files
author
jomae
committed
1.6.1dev: pin setuptools version to <81 (refs #13606)
git-svn-id: http://trac.edgewall.org/intertrac/log:/branches/1.6-stable@17923 af82e41b-90c4-0310-8c96-b1721e28e2e2
1 parent 52c6984 commit 7ed6fa9

11 files changed

+12
-8
lines changed

.github/posix-prepare.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ venvdir="$HOME/venv"
100100
python -m venv "$venvdir"
101101
python="$venvdir/bin/python"
102102
. "$venvdir/bin/activate"
103-
"$python" -m pip install --upgrade pip setuptools
103+
"$python" -m pip install --upgrade pip
104+
"$python" -m pip install -r .github/requirements-prepare.txt
104105
sitedir="$("$python" -c 'import sysconfig as s; print(s.get_path("purelib"))')"
105106
svnver="$(svn --version --quiet)"
106107
svnurl="https://archive.apache.org/dist/subversion/subversion-$svnver.tar.bz2"

.github/posix-test-minimum.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ venvdir="$HOME/venv"
66
python -m venv "$venvdir"
77
. "$venvdir/bin/activate"
88
python="$venvdir/bin/python"
9-
"$python" -m pip install --upgrade pip setuptools
9+
"$python" -m pip install --upgrade pip
1010
pip install -r .github/requirements-minimum.txt
1111
pip list --format=freeze
1212
{

.github/posix-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,6 @@ venvdir="$HOME/venv"
140140
python -m venv "$venvdir"
141141
python="$venvdir/bin/python"
142142
. "$venvdir/bin/activate"
143-
"$python" -m pip install --upgrade pip setuptools
143+
"$python" -m pip install --upgrade pip
144144

145145
run_tests

.github/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -ex
55
venvdir="$HOME/venv"
66
python -m venv "$venvdir"
77
. "$venvdir/bin/activate"
8-
python -m pip install --upgrade pip setuptools
8+
python -m pip install --upgrade pip
99
pip install -r requirements-release.txt
1010
pip install setuptools-git
1111
make compile sdist wheel

.github/requirements-minimum.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
setuptools<81
12
Jinja2
23
multipart; python_version>='3.11'
34
aiosmtpd; python_version>='3.10'

.github/requirements-prepare.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
setuptools<81

.github/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
setuptools<81
12
Jinja2
23
multipart; python_version>='3.11'
34
aiosmtpd; python_version>='3.10'

.github/windows-test-minimum.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ $venvdir = "$($env:LocalAppData)\venv"
22
& python -m venv $venvdir
33
$python = "$venvdir\scripts\python.exe"
44
& "$venvdir\scripts\activate.ps1"
5-
& $python -m pip install --upgrade pip setuptools
5+
& $python -m pip install --upgrade pip
66
& $python -m pip install -r .github\requirements-minimum.txt
77
& $python -m pip list --format=freeze
88

.github/windows-test.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ $venvdir = "$($env:LocalAppData)\venv"
22
& python -m venv $venvdir
33
& "$venvdir\scripts\activate.ps1"
44
$python = "$venvdir\scripts\python.exe"
5-
& $python -m pip install --upgrade pip setuptools
5+
& $python -m pip install --upgrade pip
66
& $python -m pip install -r .github\requirements.txt
77
& $python -m pip list --format=freeze
88

requirements-release.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Packages needed to create a release.
2-
setuptools>=75.3.1
2+
setuptools>=75.3.1,<81
33
wheel
44
jinja2
55
babel

0 commit comments

Comments
 (0)