Merge pull request #1104 from common-workflow-language/travis-xenial

Travis CI is moving to Xenial, try that now

Author: mr-c

.travis.yml

@@ -1,5 +1,4 @@
-dist: trusty
-sudo: required
+dist: xenial
 services:
   - docker
 
@@ -23,15 +22,14 @@ jobs:
   include:
     - stage: test
       python: "2.7"
-    - stage: test
-      python: "3.4"
     - stage: test
       python: "3.5"
     - stage: test
       python: "3.6"
     - stage: test
       python: "3.7"
-      dist: xenial
+    #- stage: test
+    #  python: "3.8-dev"  # ruamel.yaml doesn't support 3.8 yet
     - stage: release-test
       python: "2.7"
       script: RELEASE_SKIP=head ${TRAVIS_BUILD_DIR}/release-test.sh

CONTRIBUTING.md

@@ -1,11 +1,11 @@
 Style guide:
 PEP-8
-Python 2.7 + Python 3.4+ compatible code
+Python 2.7 + Python 3.5+ compatible code
 PEP-484 type hints, in comments for Python 2.7 compatability
 Vertically align the type hints in function definitions
 
 In order to contribute to the development of ``cwltool``, you need to install cwltool from source (preferably in a virtual environment):
-Here's a rough 
+Here's a rough guide (improvements are welcome!) 
 - Install virtualenv via pip: ``pip install virtualenv``
 - Clone the cwltool: ``git clone https://github.com/common-workflow-language/cwltool.git``
 - Switch to cwltool directory: ``cd cwltool``

README.rst

@@ -25,7 +25,7 @@ intended to be feature complete and provide comprehensive validation of CWL
 files as well as provide other tools related to working with CWL.
 
 This is written and tested for
-`Python <https://www.python.org/>`_ ``2.7 and 3.x {x = 4, 5, 6, 7}``
+`Python <https://www.python.org/>`_ ``2.7 and 3.x {x = 5, 6, 7}``
 
 The reference implementation consists of two packages.  The ``cwltool`` package
 is the primary Python module containing the reference implementation in the

appveyor.yml

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

setup.py

@@ -98,7 +98,6 @@
           'Programming Language :: Python :: 2',
           'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.4',  # except on MS Windows
           'Programming Language :: Python :: 3.5',
           'Programming Language :: Python :: 3.6',
           'Programming Language :: Python :: 3.7',

tox.ini

@@ -1,9 +1,9 @@
 [tox]
 envlist =
-  py{27,34,35,36,37}-lint,
-  py{27,34,35,36,37}-unit,
-  py{27,34,35,36,37}-bandit,
-  py{34,35,36,36,37}-mypy{2,3},
+  py{27,35,36,37,38}-lint,
+  py{27,35,36,37,38}-unit,
+  py{27,35,36,37,38}-bandit,
+  py{35,36,36,37,38}-mypy{2,3},
   py27-pipconflictchecker,
   py27-lint-readme,
   py27-pydocstyle
@@ -14,10 +14,10 @@ skip_missing_interpreters = True
 [travis]
 python =
   2.7: py27
-  3.4: py34
   3.5: py35
   3.6: py36
   3.7: py37
+  3.8-dev: py38
 
 [testenv]
 passenv =
@@ -26,35 +26,35 @@ passenv =
   TRAVIS_*
 deps =
   -rrequirements.txt
-  py{27,34,35,36,37}-unit: codecov
-  py{27,34,35,36,37}-unit: pytest-xdist<1.28.0
-  py{27,34,35,36,37}-unit: pytest-cov
-  py{27,34,35,36,37}-unit: -rtest-requirements.txt
-  py{27,34,35,36,37}-unit: galaxy-lib
-  py{27,34,35,36,37}-lint: flake8
-  py{27,34,35,36,37}-bandit: bandit
-  py{34,35,36,36,37}-mypy{2,3}: mypy==0.620
+  py{27,35,36,37,38}-unit: codecov
+  py{27,35,36,37,38}-unit: pytest-xdist<1.28.0
+  py{27,35,36,37,38}-unit: pytest-cov
+  py{27,35,36,37,38}-unit: -rtest-requirements.txt
+  py{27,35,36,37,38}-unit: galaxy-lib
+  py{27,35,36,37,38}-lint: flake8
+  py{27,35,36,37,38}-bandit: bandit
+  py{35,36,36,37,38}-mypy{2,3}: mypy==0.620
 
 setenv =
-  py{27,34,35,36,37}-unit: LC_ALL = C
+  py{27,35,36,37,38}-unit: LC_ALL = C
 
 commands =
-  py{27,34,35,36,37}-unit: python -m pip install -U pip setuptools wheel
-  py{27,34,35,36,37}-unit: python -m pip install -e .[deps]
-  py{27,34,35,36,37}-unit: python -m pip install -rtest-requirements.txt
-  py{27,34,35,36,37}-unit: coverage run --parallel-mode -m pytest --strict {posargs}
-  py{27,34,35,36,37}-unit: coverage combine
-  py{27,34,35,36,37}-unit: coverage report
-  py{27,34,35,36,37}-unit: coverage xml
-  py{27,34,35,36,37}-unit: codecov --file coverage.xml
-  py{27,34,35,36,37}-bandit: bandit -r cwltool
-  py{27,34,35,36,37}-lint: flake8 schema_salad setup.py
-  py{34,35,36,36,37}-mypy2: make mypy2
-  py{34,35,36,36,37}-mypy3: make mypy3
+  py{27,35,36,37,38}-unit: python -m pip install -U pip setuptools wheel
+  py{27,35,36,37,38}-unit: python -m pip install -e .[deps]
+  py{27,35,36,37,38}-unit: python -m pip install -rtest-requirements.txt
+  py{27,35,36,37,38}-unit: coverage run --parallel-mode -m pytest --strict {posargs}
+  py{27,35,36,37,38}-unit: coverage combine
+  py{27,35,36,37,38}-unit: coverage report
+  py{27,35,36,37,38}-unit: coverage xml
+  py{27,35,36,37,38}-unit: codecov --file coverage.xml
+  py{27,35,36,37,38}-bandit: bandit -r cwltool
+  py{27,35,36,37,38}-lint: flake8 schema_salad setup.py
+  py{35,36,36,37,38}-mypy2: make mypy2
+  py{35,36,36,37,38}-mypy3: make mypy3
 
 whitelist_externals =
-  py{27,34,35,36,37}-lint: flake8
-  py{34,35,36,36,37}-mypy{2,3}: make
+  py{27,35,36,37,38}-lint: flake8
+  py{35,36,36,37,38}-mypy{2,3}: make
 
 [testenv:py27-pipconflictchecker]
 commands = pipconflictchecker