Skip to content

Commit 8f77e70

Browse files
committed
bump minimum setuptools version for Python3.9
1 parent 90a31b3 commit 8f77e70

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

release-test.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ module=schema_salad
88
if [ "$GITHUB_ACTIONS" = "true" ]; then
99
# We are running as a GH Action
1010
repo=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git
11-
HEAD=${GITHUB_SHA}
11+
HEAD=${GITHUB_REF}
1212
else
1313
repo=https://github.com/common-workflow-language/schema_salad.git
1414
HEAD=$(git rev-parse HEAD)
1515
fi
1616
run_tests="bin/py.test --pyargs ${module}"
1717
pipver=18 # minimum required version of pip
18-
setupver=40.3 # minimum required version of setuptools
18+
setupver=41.1.0 # minimum required version of setuptools
1919
PYVER=${PYVER:=3}
2020

2121
rm -Rf "testenv${PYVER}_"? || /bin/true
2222

2323
if [ "${RELEASE_SKIP}" != "head" ]
2424
then
25-
virtualenv "testenv${PYVER}_1" -p "python${PYVER}"
25+
"python${PYVER}" -m venv "testenv${PYVER}_1"
2626
# First we test the head
2727
# shellcheck source=/dev/null
2828
source "testenv${PYVER}_1/bin/activate"
@@ -43,18 +43,18 @@ then
4343
fi
4444

4545

46-
virtualenv "testenv${PYVER}_2" -p "python${PYVER}"
47-
virtualenv "testenv${PYVER}_3" -p "python${PYVER}"
48-
virtualenv "testenv${PYVER}_4" -p "python${PYVER}"
49-
virtualenv "testenv${PYVER}_5" -p "python${PYVER}"
46+
"python${PYVER}" -m venv "testenv${PYVER}_2"
47+
"python${PYVER}" -m venv "testenv${PYVER}_3"
48+
"python${PYVER}" -m venv "testenv${PYVER}_4"
49+
"python${PYVER}" -m venv "testenv${PYVER}_5"
5050

5151

5252
# Secondly we test via pip
5353

5454
pushd "testenv${PYVER}_2"
5555
# shellcheck source=/dev/null
5656
source bin/activate
57-
rm lib/python-wheels/setuptools* \
57+
rm -f lib/python-wheels/setuptools* \
5858
&& pip install --force-reinstall -U pip==${pipver} \
5959
&& pip install setuptools==${setupver} wheel
6060
# The following can fail if you haven't pushed your commits to ${repo}
@@ -77,7 +77,7 @@ popd
7777
pushd "testenv${PYVER}_3/"
7878
# shellcheck source=/dev/null
7979
source bin/activate
80-
rm lib/python-wheels/setuptools* \
80+
rm -f lib/python-wheels/setuptools* \
8181
&& pip install --force-reinstall -U pip==${pipver} \
8282
&& pip install setuptools==${setupver} wheel
8383
pip install ${package}*tar.gz
@@ -100,7 +100,7 @@ popd
100100
pushd "testenv${PYVER}_4/"
101101
# shellcheck source=/dev/null
102102
source bin/activate
103-
rm lib/python-wheels/setuptools* \
103+
rm -f lib/python-wheels/setuptools* \
104104
&& pip install --force-reinstall -U pip==${pipver} \
105105
&& pip install setuptools==${setupver} wheel
106106
pip install ${module}*.whl

0 commit comments

Comments
 (0)