Skip to content

Commit ea6273d

Browse files
committed
minimum setuptools & pip versions for Python3.9
1 parent 0b78dec commit ea6273d

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

.github/workflows/ci-tests.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ name: Continous integration tests
22

33
on:
44
push:
5+
branches: [ main ]
56
pull_request:
7+
branches: [ main ]
68

79
env:
810
singularity_version: 3.6.4
@@ -139,7 +141,7 @@ jobs:
139141
run: ./conformance-test.sh
140142

141143
release_test:
142-
name: CWL release test
144+
name: cwltool release test
143145

144146
runs-on: ubuntu-20.04
145147

release-test.sh

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@ module=cwltool
1111
if [ "$GITHUB_ACTIONS" = "true" ]; then
1212
# We are running as a GH Action
1313
repo=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git
14-
HEAD=${GITHUB_SHA}
14+
HEAD=${GITHUB_REF}
1515
else
1616
repo=https://github.com/common-workflow-language/cwltool.git
1717
HEAD=$(git rev-parse HEAD)
1818
fi
19-
2019
test_prefix=""
2120
run_tests() {
2221
local mod_loc
@@ -25,22 +24,21 @@ run_tests() {
2524
"${test_prefix}"bin/py.test "--ignore=${mod_loc}/schemas/" \
2625
--pyargs -x ${module} -n auto --dist=loadfile
2726
}
28-
pipver=7.0.2 # minimum required version of pip
29-
setuptoolsver=24.2.0 # required to generate correct metadata for
30-
# python_requires
27+
pipver=20.3b1 # minimum required version of pip for Python 3.9
28+
setuptoolsver=41.1.0 # required for Python 3.9
3129
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
3230

3331
rm -Rf testenv? || /bin/true
3432

3533

3634
if [ "${RELEASE_SKIP}" != "head" ]
3735
then
38-
virtualenv testenv1 -p python3
36+
python3 -m venv testenv_1
3937
# First we test the head
4038
# shellcheck source=/dev/null
4139
source testenv1/bin/activate
4240
rm -Rf testenv1/local
43-
rm testenv1/lib/python-wheels/setuptools* \
41+
rm -f testenv1/lib/python-wheels/setuptools* \
4442
&& pip install --force-reinstall -U pip==${pipver} \
4543
&& pip install setuptools==${setuptoolsver} wheel
4644
make install-dep
@@ -55,17 +53,17 @@ then
5553
test_prefix=../ run_tests; popd
5654
fi
5755

58-
virtualenv testenv2 -p python3
59-
virtualenv testenv3 -p python3
60-
virtualenv testenv4 -p python3
56+
python3 -m venv testenv2
57+
python3 -m venv testenv3
58+
python3 -m venv testenv4
6159
rm -Rf testenv[234]/local
6260

6361
# Secondly we test via pip
6462

6563
cd testenv2
6664
# shellcheck source=/dev/null
6765
source bin/activate
68-
rm lib/python-wheels/setuptools* \
66+
rm -f lib/python-wheels/setuptools* \
6967
&& pip install --force-reinstall -U pip==${pipver} \
7068
&& pip install setuptools==${setuptoolsver} wheel
7169
pip install -e "git+${repo}@${HEAD}#egg=${package}" #[deps]
@@ -85,7 +83,7 @@ run_tests
8583
cd ../testenv3/
8684
# shellcheck source=/dev/null
8785
source bin/activate
88-
rm lib/python-wheels/setuptools* \
86+
rm -f lib/python-wheels/setuptools* \
8987
&& pip install --force-reinstall -U pip==${pipver} \
9088
&& pip install setuptools==${setuptoolsver} wheel
9189
package_tar=$(find . -name "${package}*tar.gz")

0 commit comments

Comments
 (0)