Skip to content

Commit addcaa2

Browse files
authored
Merge pull request #685 from common-workflow-language/python_requires
Use python_requires
2 parents bcaa289 + 9d18337 commit addcaa2

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

release-test.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ slug=${TRAVIS_PULL_REQUEST_SLUG:=common-workflow-language/cwltool}
99
repo=https://github.com/${slug}.git
1010
run_tests="bin/py.test --ignore ${module}/schemas/ --pyarg cwltool"
1111
pipver=7.0.2 # minimum required version of pip
12+
setuptoolsver=24.2.0 # required to generate correct metadata for
13+
# python_requires
1214

1315
rm -Rf testenv? || /bin/true
1416

@@ -22,7 +24,7 @@ then
2224
source testenv1/bin/activate
2325
rm testenv1/lib/python-wheels/setuptools* \
2426
&& pip install --force-reinstall -U pip==${pipver} \
25-
&& pip install setuptools==20.10.1 wheel
27+
&& pip install setuptools==${setuptoolsver} wheel
2628
make install-dep
2729
make test
2830
pip uninstall -y ${package} || true; pip uninstall -y ${package} || true; make install
@@ -46,7 +48,7 @@ cd testenv2
4648
source bin/activate
4749
rm lib/python-wheels/setuptools* \
4850
&& pip install --force-reinstall -U pip==${pipver} \
49-
&& pip install setuptools==20.10.1 wheel
51+
&& pip install setuptools==${setuptoolsver} wheel
5052
pip install -e "git+${repo}@${HEAD}#egg=${package}"
5153
cd src/${package}
5254
make install-dep
@@ -66,7 +68,7 @@ cd ../testenv3/
6668
source bin/activate
6769
rm lib/python-wheels/setuptools* \
6870
&& pip install --force-reinstall -U pip==${pipver} \
69-
&& pip install setuptools==20.10.1 wheel
71+
&& pip install setuptools==${setuptoolsver} wheel
7072
pip install ${package}*tar.gz
7173
pip install pytest mock
7274
mkdir out

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
extras_require={
6161
'deps': ["galaxy-lib >= 17.09.3"]
6262
},
63+
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4',
6364
setup_requires=[] + pytest_runner,
6465
test_suite='tests',
6566
tests_require=['pytest', 'mock >= 2.0.0',],

0 commit comments

Comments
 (0)