From a03530ccf8253f3e53ac03309d235a5288ef793a Mon Sep 17 00:00:00 2001 From: Michael Manganiello Date: Sun, 3 Nov 2019 07:39:56 +0100 Subject: [v3.0] Add newer Python 3 versions to build matrix (#1111) * [v3.0] Add newer Python 3 versions to build matrix For the `3.0` branch, add newer Python versions to the build matrix, up to Python 3.7. This is motivated by #1100, which backported a fix for the `3.0` branch to work with Python 3.7. * Remove support for EOL Python versions * Update AppVeyor configuration * Avoid using the removepyc.sh file, which is not compatible with Windows/AppVeyor * Specify PyPy versions for Travis * Remove unwanted pyenv file * Set PYTHONUNBUFFERED in Travis * Refactor getfilesystemencoding patch * Try casting ascii to str * Add test to check if ascii codec is registered * List encoding aliases when ascii codec is not registered * Revert changes to encoding tests * Add Python 3.8 to Travis matrix * Try to use pypy2.7-7.2 * Try pypy2.7-7.2.0 instead * Revert to pypy2.7-7.1.1 --- setup.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index bd2d5c3d..7cee1c62 100644 --- a/setup.py +++ b/setup.py @@ -116,8 +116,6 @@ def reqs(*f): ) if r] install_requires = reqs('default.txt') -if py_version[0:2] == (2, 6): - install_requires.extend(reqs('py26.txt')) # -*- Tests Requires -*- @@ -144,8 +142,6 @@ extras_require = extra['extras_require'] = { 'qpid': extras('qpid.txt'), } -extras_require[':python_version=="2.6"'] = reqs('py26.txt') - setup( name='kombu', version=meta['VERSION'], @@ -166,10 +162,10 @@ setup( 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', -- cgit v1.2.1