Merge pull request #681 from common-workflow-language/better_release

Better release

Author: mr-c

.travis.yml

@@ -3,7 +3,6 @@ language: python
 cache: pip
 python:
   - 2.7
-  - 3.3
   - 3.4
   - 3.5
   - 3.6

appveyor.yml

@@ -12,10 +12,6 @@ environment:
       PYTHON_VERSION: "2.7.x"
       PYTHON_ARCH: "64"
 
-    - PYTHON: "C:\\Python33-x64"
-      PYTHON_VERSION: "3.3.x"
-      PYTHON_ARCH: "64"
-
     - PYTHON: "C:\\Python34-x64"
       PYTHON_VERSION: "3.4.x"
       PYTHON_ARCH: "64"

release-test.sh

@@ -5,8 +5,9 @@ set -x
 
 package=cwltool
 module=cwltool
-repo=https://github.com/common-workflow-language/cwltool.git
-run_tests="py.test --ignore ${module}/schemas/ --pyarg cwltool"
+slug=${TRAVIS_PULL_REQUEST_SLUG:=common-workflow-language/cwltool}
+repo=https://github.com/${slug}.git
+run_tests="bin/py.test --ignore ${module}/schemas/ --pyarg cwltool"
 pipver=7.0.2 # minimum required version of pip
 
 rm -Rf testenv? || /bin/true
@@ -17,6 +18,7 @@ if [ "${RELEASE_SKIP}" != "head" ]
 then
 	virtualenv testenv1
 	# First we test the head
+	# shellcheck source=/dev/null
 	source testenv1/bin/activate
 	rm testenv1/lib/python-wheels/setuptools* \
 		&& pip install --force-reinstall -U pip==${pipver} \
@@ -27,7 +29,9 @@ then
 	mkdir testenv1/not-${module}
 	# if there is a subdir named '${module}' py.test will execute tests
 	# there instead of the installed module's tests
-	pushd testenv1/not-${module}; ../bin/${run_tests}; popd
+	pushd testenv1/not-${module}
+	# shellcheck disable=SC2086
+	../${run_tests}; popd
 fi
 
 virtualenv testenv2
@@ -38,24 +42,27 @@ virtualenv testenv4
 # Secondly we test via pip
 
 cd testenv2
+# shellcheck source=/dev/null
 source bin/activate
 rm lib/python-wheels/setuptools* \
 	&& pip install --force-reinstall -U pip==${pipver} \
         && pip install setuptools==20.10.1 wheel
-pip install -e git+${repo}@${HEAD}#egg=${package}
+pip install -e "git+${repo}@${HEAD}#egg=${package}"
 cd src/${package}
 make install-dep
 make dist
 make test
 cp dist/${package}*tar.gz ../../../testenv3/
 pip uninstall -y ${package} || true; pip uninstall -y ${package} || true; make install
 cd ../.. # no subdir named ${proj} here, safe for py.testing the installed module
-bin/${run_tests}
+# shellcheck disable=SC2086
+${run_tests}
 
 # Is the distribution in testenv2 complete enough to build another
 # functional distribution?
 
 cd ../testenv3/
+# shellcheck source=/dev/null
 source bin/activate
 rm lib/python-wheels/setuptools* \
 	&& pip install --force-reinstall -U pip==${pipver} \
@@ -69,4 +76,6 @@ make dist
 make test
 pip uninstall -y ${package} || true; pip uninstall -y ${package} || true; make install
 mkdir ../not-${module}
-pushd ../not-${module} ; ../../bin/${run_tests}; popd
+pushd ../not-${module}
+# shellcheck disable=SC2086
+../../${run_tests}; popd

setup.py

@@ -88,7 +88,6 @@
           'Programming Language :: Python :: 2',
           'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.3',
           'Programming Language :: Python :: 3.4',
           'Programming Language :: Python :: 3.5',
           'Programming Language :: Python :: 3.6',

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 envlist =
-  py{27,33,34,35,36}-lint,
-  py{27,33,34,35,36}-unit,
+  py{27,34,35,36}-lint,
+  py{27,34,35,36}-unit,
   py35-mypy{2,3},
   py27-pipconflictchecker,
   py27-lint-readme,
@@ -12,22 +12,21 @@ skip_missing_interpreters = True
 
 [tox:travis]
 2.7 = py27
-3.3 = py33
 3.4 = py34
 3.5 = py35
 3.6 = py36
 
 [testenv]
 deps =
   -rrequirements.txt
-  py{27,33,34,35,36}-lint: flake8
+  py{27,34,35,36}-lint: flake8
 
 commands =
-  py{27,33,34,35,36}-unit: python setup.py test
-  py{27,33,34,35,36}-lint: flake8 schema_salad setup.py
+  py{27,34,35,36}-unit: python setup.py test
+  py{27,34,35,36}-lint: flake8 schema_salad setup.py
 
 whitelist_externals =
-  py{27,33,34,35,36}-lint: flake8
+  py{27,34,35,36}-lint: flake8
 
 [testenv:py35-mypy2]
 commands = make mypy2