From eb5952f28535fccd48d0ac96ed4c23f03a258d35 Mon Sep 17 00:00:00 2001 From: Hugo Date: Thu, 5 Sep 2019 19:03:25 +0300 Subject: [PATCH 1/2] Drop support for EOL Python 3.4 --- .travis.yml | 4 ---- appveyor.yml | 1 - ci/templates/appveyor.yml | 1 - docs/releasing.rst | 2 +- setup.py | 3 +-- tox.ini | 2 +- 6 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 978ea5de..da9cf8ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,10 +25,6 @@ jobs: python: '2.7' - env: TOXENV=py27-pytest46-xdist27-coverage45 python: '2.7' - - env: TOXENV=py34-pytest310-xdist27-coverage45 - python: '3.4' - - env: TOXENV=py34-pytest46-xdist27-coverage45 - python: '3.4' - env: TOXENV=py35-pytest310-xdist27-coverage45 python: '3.5' - env: TOXENV=py35-pytest46-xdist27-coverage45 diff --git a/appveyor.yml b/appveyor.yml index 81ac635d..fbd8ca33 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,6 @@ environment: matrix: - TOXENV: check - TOXENV: 'py27-pytest310-xdist27-coverage45,py27-pytest46-xdist27-coverage45,py27-pytest310-xdist27-coverage50,py27-pytest46-xdist27-coverage50' - - TOXENV: 'py34-pytest310-xdist27-coverage45,py34-pytest46-xdist27-coverage45' - TOXENV: 'py35-pytest310-xdist27-coverage45,py35-pytest46-xdist27-coverage45,py35-pytest310-xdist27-coverage50,py35-pytest46-xdist27-coverage50' - TOXENV: 'py36-pytest310-xdist27-coverage45,py36-pytest46-xdist27-coverage45,py36-pytest310-xdist27-coverage50,py36-pytest46-xdist27-coverage50,py36-pytest46-xdist29-coverage45,py36-pytest46-xdist29-coverage50,py36-pytest46-xdist30-coverage45,py36-pytest46-xdist30-coverage50,py36-pytest51-xdist29-coverage45,py36-pytest51-xdist29-coverage50,py36-pytest51-xdist30-coverage45,py36-pytest51-xdist30-coverage50,py36-pytest52-xdist29-coverage45,py36-pytest52-xdist29-coverage50,py36-pytest52-xdist30-coverage45,py36-pytest52-xdist30-coverage50' - TOXENV: 'py37-pytest310-xdist27-coverage45,py37-pytest46-xdist27-coverage45,py37-pytest310-xdist27-coverage50,py37-pytest46-xdist27-coverage50,py37-pytest46-xdist29-coverage45,py37-pytest46-xdist29-coverage50,py37-pytest46-xdist30-coverage45,py37-pytest46-xdist30-coverage50,py37-pytest51-xdist29-coverage45,py37-pytest51-xdist29-coverage50,py37-pytest51-xdist30-coverage45,py37-pytest51-xdist30-coverage50,py37-pytest52-xdist29-coverage45,py37-pytest52-xdist29-coverage50,py37-pytest52-xdist30-coverage45,py37-pytest52-xdist30-coverage50' diff --git a/ci/templates/appveyor.yml b/ci/templates/appveyor.yml index 8c3bf552..8563d501 100644 --- a/ci/templates/appveyor.yml +++ b/ci/templates/appveyor.yml @@ -4,7 +4,6 @@ environment: matrix: - TOXENV: check - TOXENV: '{{ py27_environments|join(",") }}' - - TOXENV: '{{ py34_environments|join(",") }}' - TOXENV: '{{ py35_environments|join(",") }}' - TOXENV: '{{ py36_environments|join(",") }}' - TOXENV: '{{ py37_environments|join(",") }}' diff --git a/docs/releasing.rst b/docs/releasing.rst index c9e4d671..245dca54 100644 --- a/docs/releasing.rst +++ b/docs/releasing.rst @@ -26,7 +26,7 @@ The process for releasing should follow these steps: These files need to be removed to force distutils/setuptools to rebuild everything and recreate the egg-info metadata. #. Build the dists:: - python3.4 setup.py clean --all sdist bdist_wheel + python3 setup.py clean --all sdist bdist_wheel #. Verify that the resulting archives (found in ``dist/``) are good. #. Upload the sdist and wheel with twine:: diff --git a/setup.py b/setup.py index c21d9bea..207bfefd 100644 --- a/setup.py +++ b/setup.py @@ -109,7 +109,6 @@ def run(self): 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', @@ -125,7 +124,7 @@ def run(self): 'pytest>=3.6', 'coverage>=4.4' ], - python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', + python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*', extras_require={ 'testing': [ 'fields', diff --git a/tox.ini b/tox.ini index 1040aafe..bd30267c 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ [tox] envlist = check - py{27,34,35,36,37,py,py3}-pytest{310,46}-xdist27-coverage45 + py{27,35,36,37,py,py3}-pytest{310,46}-xdist27-coverage45 py{27,35,36,37,py,py3}-pytest{310,46}-xdist27-coverage50 py{36,37,38,py3}-pytest{46,51,52}-xdist{29,30}-coverage{45,50} docs From 85754390c7dba80b8cccf0ab12d55f57c093b75a Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 8 Oct 2019 17:59:18 +0300 Subject: [PATCH 2/2] Remove unused env vars --- tox.ini | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tox.ini b/tox.ini index bd30267c..ed062d34 100644 --- a/tox.ini +++ b/tox.ini @@ -15,16 +15,10 @@ setenv = # Use env vars for (optional) pinning of deps. pytest310: _DEP_PYTEST=pytest==3.10.1 - pytest40: _DEP_PYTEST=pytest==4.0.2 - pytest41: _DEP_PYTEST=pytest==4.1.1 - pytest43: _DEP_PYTEST=pytest==4.3.1 - pytest44: _DEP_PYTEST=pytest==4.4.2 - pytest45: _DEP_PYTEST=pytest==4.5.0 pytest46: _DEP_PYTEST=pytest==4.6.5 pytest51: _DEP_PYTEST=pytest==5.1.3 pytest52: _DEP_PYTEST=pytest==5.2.0 - xdist22: _DEP_PYTESTXDIST=pytest-xdist==1.22.0 xdist27: _DEP_PYTESTXDIST=pytest-xdist==1.27.0 xdist28: _DEP_PYTESTXDIST=pytest-xdist==1.28.0 xdist29: _DEP_PYTESTXDIST=pytest-xdist==1.29.0