From 3db639fee74a10524e6908318f3f8f6e7c545e9b Mon Sep 17 00:00:00 2001 From: Bert JW Regeer Date: Sun, 2 Feb 2020 16:38:23 -0800 Subject: Drop Python 3.4 This is necessary due to needing coverage>=5.0, which is no longer available on Python 3.4. Python 3.4 is also now past end of life. This continued to work by chance due to Travis having nosetest installed in the Python global installation, and thus the failure from tox to install coverage>=5.0 did not cause errors on Travis. Testing locally I still had an old version of coverage installed, and that version had not yet dropped Python 3.4. --- .github/workflows/ci-linux.yml | 1 + .github/workflows/ci-macos.yml | 1 + .github/workflows/ci-windows.yml | 1 + .travis.yml | 6 +----- README.rst | 2 +- docs/index.rst | 2 +- setup.py | 7 ++++--- tox.ini | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index a1c60ed..fd64233 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -12,6 +12,7 @@ jobs: {'py': '3.5', 'env': 'py35'}, {'py': '3.6', 'env': 'py36'}, {'py': '3.7', 'env': 'py37'}, + {'py': '3.8', 'env': 'py38'}, {'py': 'pypy2', 'env': 'pypy'}, {'py': 'pypy3', 'env': 'pypy3'} ] diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index d974654..c8b6c63 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -12,6 +12,7 @@ jobs: {'py': '3.5', 'env': 'py35'}, {'py': '3.6', 'env': 'py36'}, {'py': '3.7', 'env': 'py37'}, + {'py': '3.8', 'env': 'py38'}, ] architecture: ['x64'] name: "Python: ${{ matrix.tox.py }}" diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index e2ee5f6..cf0dd2b 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -12,6 +12,7 @@ jobs: {'py': '3.5', 'env': 'py35'}, {'py': '3.6', 'env': 'py36'}, {'py': '3.7', 'env': 'py37'}, + {'py': '3.8', 'env': 'py38'}, ] architecture: ['x86', 'x64'] name: "Python: ${{ matrix.tox.py }} (${{ matrix.architecture }})" diff --git a/.travis.yml b/.travis.yml index e0a8843..4bb2567 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,6 @@ matrix: include: - python: 2.7 env: TOXENV=py27 - - python: 3.4 - env: TOXENV=py34 - python: 3.5 env: TOXENV=py35 - python: 3.6 @@ -16,7 +14,7 @@ matrix: env: TOXENV=py37 dist: xenial sudo: true - - python: 3.8-dev + - python: 3.8 env: TOXENV=py38 dist: xenial sudo: true @@ -28,8 +26,6 @@ matrix: env: TOXENV=py27-cover,py35-cover,coverage - python: 3.5 env: TOXENV=docs - allow_failures: - - env: TOXENV=py38 install: - travis_retry pip install tox diff --git a/README.rst b/README.rst index 1a7b893..5e030a4 100644 --- a/README.rst +++ b/README.rst @@ -20,7 +20,7 @@ Waitress Waitress is meant to be a production-quality pure-Python WSGI server with very acceptable performance. It has no dependencies except ones which live in the Python standard library. It runs on CPython on Unix and Windows under Python -2.7+ and Python 3.4+. It is also known to run on PyPy 1.6.0+ on UNIX. It +2.7+ and Python 3.5+. It is also known to run on PyPy 1.6.0+ on UNIX. It supports HTTP/1.0 and HTTP/1.1. For more information, see the "docs" directory of the Waitress package or visit https://docs.pylonsproject.org/projects/waitress/en/latest/ diff --git a/docs/index.rst b/docs/index.rst index 1eaa42b..2f7132b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -7,7 +7,7 @@ Waitress Waitress is meant to be a production-quality pure-Python WSGI server with very acceptable performance. It has no dependencies except ones which live in the Python standard library. It runs on CPython on Unix and Windows under -Python 2.7+ and Python 3.4+. It is also known to run on PyPy 1.6.0 on UNIX. +Python 2.7+ and Python 3.5+. It is also known to run on PyPy 1.6.0 on UNIX. It supports HTTP/1.0 and HTTP/1.1. diff --git a/setup.py b/setup.py index 44da229..0468a82 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,8 @@ # ############################################################################## import os -from setuptools import setup, find_packages + +from setuptools import find_packages, setup here = os.path.abspath(os.path.dirname(__file__)) try: @@ -52,7 +53,6 @@ setup( "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", @@ -65,7 +65,8 @@ setup( ], url="https://github.com/Pylons/waitress", packages=find_packages(), - extras_require={"testing": testing_extras, "docs": docs_extras,}, + python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*", + extras_require={"testing": testing_extras, "docs": docs_extras}, include_package_data=True, test_suite="waitress", zip_safe=False, diff --git a/tox.ini b/tox.ini index 61cc9e9..cc33be4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py27,py34,py35,py36,py37,pypy,pypy3, + py27,py35,py36,py37,py38,pypy,pypy3, docs, {py27,py35}-cover,coverage -- cgit v1.2.1