Skip to content

Commit 76c81f6

Browse files
authored
Drop support/testing/CI for Python 3.5 (#1346)
1 parent d355599 commit 76c81f6

File tree

7 files changed

+37
-46
lines changed

7 files changed

+37
-46
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ install:
2020
- pip install tox-travis
2121
jobs:
2222
include:
23-
- python: "3.5"
2423
- python: "3.6"
2524
- python: "3.7"
2625
- python: "3.8"

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Style guide:
22
- PEP-8
3-
-Python 3.5+ compatible code
4-
- PEP-484 type hints; variable types in comments for Python 3.5 compatability
3+
- Python 3.6+ compatible code
4+
- PEP-484 type hints
55
- Vertically align the type hints in function definitions
66

77
In order to contribute to the development of ``cwltool``, you need to install cwltool from source (preferably in a virtual environment):
@@ -15,7 +15,7 @@ Here's a rough guide (improvements are welcome!)
1515
- Install cwltool in the virtual environment: ``pip install .``
1616
- Check the version which might be different from the version installed in general on any system: ``cwltool --version``
1717
- After you've made the changes, you can the complete test suite via tox: ``tox``
18-
- If you want to run specific tests, say ``unit tests`` in Python 3.5, then: ``tox -e py35-unit``.
18+
- If you want to run specific tests, say ``unit tests`` in Python 3.8, then: ``tox -e py38-unit``.
1919
- Look at ``tox.ini`` for all available tests and runtimes
2020
- If tests are passing, you can simply commit and create a PR on ``cwltool`` repo:
2121
- After you're done working on the ``cwltool``, you can deactivate the virtual environment: ``deactivate``

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ intended to be feature complete and provide comprehensive validation of CWL
2121
files as well as provide other tools related to working with CWL.
2222

2323
This is written and tested for
24-
`Python <https://www.python.org/>`_ ``3.x {x = 5, 6, 7, 8}``
24+
`Python <https://www.python.org/>`_ ``3.x {x = 6, 7, 8}``
2525

2626
The reference implementation consists of two packages. The ``cwltool`` package
2727
is the primary Python module containing the reference implementation in the

appveyor.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ environment:
88
SYSTEMROOT: "C:\\WINDOWS"
99

1010
matrix:
11-
- PYTHON: "C:\\Python35-x64"
12-
PYTHON_VERSION: "3.5.x"
13-
PYTHON_ARCH: "64"
14-
1511
- PYTHON: "C:\\Python36-x64"
1612
PYTHON_VERSION: "3.6.x"
1713
PYTHON_ARCH: "64"

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ ruamel.yaml>=0.12.4,<=0.16.5
33
rdflib>=4.2.2,<4.3
44
shellescape>=3.4.1,<3.5
55
schema-salad>=7,<8
6-
typing>=3.5.3; python_version<"3.6"
76
prov==1.5.1
87
bagit==1.6.4
98
mypy-extensions

setup.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,10 @@
107107
'pydot >= 1.4.1',
108108
],
109109
extras_require={
110-
':python_version<"3.6"': ["typing >= 3.5.3"],
111110
"deps": ["galaxy-tool-util"],
112111
"docs": ["sphinx >= 2.2", "sphinx-rtd-theme"],
113112
},
114-
python_requires=">=3.5, <4",
113+
python_requires=">=3.6, <4",
115114
setup_requires=PYTEST_RUNNER,
116115
test_suite="tests",
117116
tests_require=[
@@ -142,7 +141,6 @@
142141
# 'Operating System :: Microsoft :: Windows :: Windows 8', # not tested
143142
# 'Operating System :: Microsoft :: Windows :: Windows 7', # not tested
144143
"Programming Language :: Python :: 3",
145-
"Programming Language :: Python :: 3.5",
146144
"Programming Language :: Python :: 3.6",
147145
"Programming Language :: Python :: 3.7",
148146
"Programming Language :: Python :: 3.8",

tox.ini

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[tox]
22
envlist =
3-
py{35,36,37,38}-lint,
4-
py{35,36,37,38}-unit,
5-
py{35,36,37,38}-bandit,
6-
py{35,36,37,38}-mypy,
3+
py{36,37,38}-lint,
4+
py{36,37,38}-unit,
5+
py{36,37,38}-bandit,
6+
py{36,37,38}-mypy,
77
py38-lint-readme,
88
py38-pydocstyle
99

@@ -12,17 +12,16 @@ skip_missing_interpreters = True
1212

1313
[travis]
1414
python =
15-
3.5: py35
1615
3.6: py36
1716
3.7: py37
1817
3.8: py38
1918

2019
[testenv]
2120
description =
22-
py{35,36,37,38}-unit: Run the unit tests
23-
py{35,36,37,38}-lint: Lint the Python code
24-
py{35,36,37,38}-bandit: Search for common security issues
25-
py{35,36,37,38}-mypy: Check for type safety
21+
py{36,37,38}-unit: Run the unit tests
22+
py{36,37,38}-lint: Lint the Python code
23+
py{36,37,38}-bandit: Search for common security issues
24+
py{36,37,38}-mypy: Check for type safety
2625

2726
passenv =
2827
CI
@@ -31,37 +30,37 @@ passenv =
3130
PROOT_NO_SECCOMP
3231
deps =
3332
-rrequirements.txt
34-
py{35,36,37,38}-unit: codecov
35-
py{35,36,37,38}-unit: pytest-xdist
36-
py{35,36,37,38}-unit: pytest-cov
37-
py{35,36,37,38}-{unit,mypy}: -rtest-requirements.txt
38-
py{35,36,37,38}-unit: galaxy-tool-util
39-
py{35,36,37,38}-lint: flake8-bugbear
33+
py{36,37,38}-unit: codecov
34+
py{36,37,38}-unit: pytest-xdist
35+
py{36,37,38}-unit: pytest-cov
36+
py{36,37,38}-{unit,mypy}: -rtest-requirements.txt
37+
py{36,37,38}-unit: galaxy-tool-util
38+
py{36,37,38}-lint: flake8-bugbear
4039
py{36,37,38}-lint: black
41-
py{35,36,37,38}-bandit: bandit
42-
py{35,36,37,38}-mypy: mypy==0.780
40+
py{36,37,38}-bandit: bandit
41+
py{36,37,38}-mypy: mypy==0.780
4342

4443
setenv =
45-
py{35,36,37,38}-unit: LC_ALL = C
44+
py{36,37,38}-unit: LC_ALL = C
4645

4746
commands =
48-
py{35,36,37,38}-unit: python3 -m pip install -U pip setuptools wheel
49-
py{35,36,37,38}-unit: python3 -m pip install -e .[deps]
50-
py{35,36,37,38}-unit: python3 -m pip install -rtest-requirements.txt
51-
py{35,36,37,38}-unit: coverage run --parallel-mode -m pytest --strict {posargs}
52-
py{35,36,37,38}-unit: coverage combine
53-
py{35,36,37,38}-unit: coverage report
54-
py{35,36,37,38}-unit: coverage xml
55-
py{35,36,37,38}-unit: codecov --file coverage.xml
56-
py{35,36,37,38}-bandit: bandit -r cwltool
57-
py{35,36,37,38}-lint: flake8 cwltool setup.py
58-
py{35,36,37,38}-mypy: make mypy
59-
py{35,36,37,38}-mypy: make mypyc
47+
py{36,37,38}-unit: python3 -m pip install -U pip setuptools wheel
48+
py{36,37,38}-unit: python3 -m pip install -e .[deps]
49+
py{36,37,38}-unit: python3 -m pip install -rtest-requirements.txt
50+
py{36,37,38}-unit: coverage run --parallel-mode -m pytest --strict {posargs}
51+
py{36,37,38}-unit: coverage combine
52+
py{36,37,38}-unit: coverage report
53+
py{36,37,38}-unit: coverage xml
54+
py{36,37,38}-unit: codecov --file coverage.xml
55+
py{36,37,38}-bandit: bandit -r cwltool
56+
py{36,37,38}-lint: flake8 cwltool setup.py
57+
py{36,37,38}-mypy: make mypy
58+
py{36,37,38}-mypy: make mypyc
6059

6160
whitelist_externals =
62-
py{35,36,37,38}-lint: flake8
63-
py{35,36,37,38}-lint: black
64-
py{35,36,37,38}-mypy: make
61+
py{36,37,38}-lint: flake8
62+
py{36,37,38}-lint: black
63+
py{36,37,38}-mypy: make
6564

6665
[testenv:py38-pydocstyle]
6766
whitelist_externals = make

0 commit comments

Comments
 (0)