Merge branch 'master' into update-script

Author: mr-c

jenkins.bash

@@ -1,24 +1,45 @@
-#!/usr/bin/bash
+#!/bin/bash
+if [ "$JENKINS_URL" == ""]
+then
+	echo "Looks like we're not being run by Jenkins, this is dangerous"
+	echo "due to use of git clean -fdx command."
+	exit 1
+fi
 cloneorpull() {
-        if test -d $1 ; then
-                (cd $1 && git pull)
+        if test -d "$1" ; then
+                (cd "$1" && git pull)
         else
-                git clone $2
+                git clone "$2"
         fi
 }
 venv() {
-        if ! test -d $1 ; then
-                virtualenv $1
+        if ! test -d "$1" ; then
+                virtualenv "$1"
         fi
-        . $1/bin/activate
+	# shellcheck source=/dev/null
+        source "$1"/bin/activate
 }
+git clean --force -d -x || /bin/true
 cloneorpull common-workflow-language https://github.com/common-workflow-language/common-workflow-language.git
 venv cwltool-venv
-(. cwltool-venv/bin/activate && PIP_DOWNLOAD_CACHE=/var/lib/jenkins/pypi-cache/ pip install -U setuptools wheel pip)
-(. cwltool-venv/bin/activate && PIP_DOWNLOAD_CACHE=/var/lib/jenkins/pypi-cache/ python setup.py install)
-(. cwltool-venv/bin/activate && PIP_DOWNLOAD_CACHE=/var/lib/jenkins/pypi-cache/ pip install "cwltest>=1.0.20160825151655")
-# (. cwltool-venv/bin/activate && cd common-workflow-language && ./run_test.sh --junit-xml=result.xml RUNNER=cwltool DRAFT=draft-2)
-(. cwltool-venv/bin/activate && cd common-workflow-language && ./run_test.sh --junit-xml=result.xml RUNNER=cwltool DRAFT=draft-3)
-(. cwltool-venv/bin/activate && cd common-workflow-language && ./run_test.sh --junit-xml=result.xml RUNNER=cwltool)
-(. cwltool-venv/bin/activate && cd common-workflow-language && ./run_test.sh --junit-xml=result.xml RUNNER=cwltool DRAFT=v1.1.0-dev1 EXTRA=--enable-dev)
-(. cwltool-venv/bin/activate && ./build-cwl-docker.sh && docker push commonworkflowlanguage/cwltool_module && docker push commonworkflowlanguage/cwltool)
+docker pull node:slim
+export PIP_DOWNLOAD_CACHE=/var/lib/jenkins/pypi-cache/
+pip install -U setuptools wheel pip
+python setup.py install
+pip install "cwltest>=1.0.20160825151655"
+pushd common-workflow-language
+git clean --force -d -x || /bin/true
+# shellcheck disable=SC2154
+if [[ "$version" = *dev* ]]
+then
+	EXTRA="EXTRA=--enable-dev"
+fi
+./run_test.sh --junit-xml=result.xml RUNNER=cwltool -j4 DRAFT="${version}" ${EXTRA}
+CODE=$?
+popd
+if [ "$GIT_BRANCH" = "origin/master" ]
+then
+  ./build-cwl-docker.sh && docker push commonworkflowlanguage/cwltool_module && docker push commonworkflowlanguage/cwltool
+fi
+#docker rm -v $(docker ps -a -f status=exited | sed 's/  */ /g' | cut -d' ' -f1)
+exit ${CODE}

setup.cfg

@@ -2,6 +2,9 @@
 ignore = E124,E128,E129,E201,E202,E225,E226,E231,E265,E271,E302,E303,F401,E402,E501,W503,E731,F811,F821,F841
 exclude = cwltool/schemas
 
+[bdist_wheel]
+universal = 1
+
 [aliases]
 test=pytest
 

setup.py

@@ -32,7 +32,8 @@
       author_email='[email protected]',
       url="https://github.com/common-workflow-language/cwltool",
       download_url="https://github.com/common-workflow-language/cwltool",
-      license='Apache 2.0',
+      # platforms='',  # empty as is conveyed by the classifier below
+      # license='',  # empty as is conveyed by the classifier below
       packages=["cwltool", 'cwltool.tests'],
       package_dir={'cwltool.tests': 'tests'},
       package_data={'cwltool': ['schemas/draft-2/*.yml',
@@ -74,8 +75,35 @@
       cmdclass={'egg_info': tagger},
       classifiers=[
           'Development Status :: 5 - Production/Stable',
+          'Environment :: Console',
+          'Intended Audience :: Developers',
+          'Intended Audience :: Science/Research',
+          'Intended Audience :: Healthcare Industry',
+          'License :: OSI Approved :: Apache Software License',
+          'Natural Language :: English',
+          'Operating System :: MacOS :: MacOS X',
           'Operating System :: POSIX',
+          'Operating System :: POSIX :: Linux',
           'Operating System :: OS Independent',
-          'Programming Language :: Python :: 2 :: Only',
+          # 'Operating System :: Microsoft :: Windows',  # soon!
+          # 'Operating System :: Microsoft :: Windows :: Windows 10',  # soon!
+          # 'Operating System :: Microsoft :: Windows :: Windows 8.1',  # soon!
+          # 'Operating System :: Microsoft :: Windows :: Windows 8',  # not tested
+          # 'Operating System :: Microsoft :: Windows :: Windows 7',  # not tested
+          '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',
+          'Topic :: Scientific/Engineering',
+          'Topic :: Scientific/Engineering :: Bio-Informatics',
+          'Topic :: Scientific/Engineering :: Astronomy',
+          'Topic :: Scientific/Engineering :: Atmospheric Science',
+          'Topic :: Scientific/Engineering :: Information Analysis',
+          'Topic :: Scientific/Engineering :: Medical Science Apps.',
+          'Topic :: System :: Distributed Computing',
+          'Topic :: Utilities',
       ]
       )