diff options
author | Hugo <hugovk@users.noreply.github.com> | 2018-09-06 16:56:39 +0300 |
---|---|---|
committer | Hugo <hugovk@users.noreply.github.com> | 2018-09-06 16:56:39 +0300 |
commit | becb8d266366edbcaf204ebaa7bbef6cf82e4d86 (patch) | |
tree | bcc34523348b231480458ec58e13d37a2e6b00e7 | |
parent | d4ce8c74cef9dd8ef246b3ce5689fc488c511834 (diff) | |
download | uritemplates-becb8d266366edbcaf204ebaa7bbef6cf82e4d86.tar.gz |
Drop support for EOL Python
-rw-r--r-- | .travis.yml | 4 | ||||
-rw-r--r-- | old/uritemplate.py/uritemplatepy-setup.py | 5 | ||||
-rw-r--r-- | setup.py | 4 | ||||
-rw-r--r-- | tox.ini | 3 | ||||
-rw-r--r-- | uritemplate/variable.py | 4 |
5 files changed, 5 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index c4783f4..ea6648d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,8 @@ sudo: false matrix: include: - - python: 2.6 - env: TOXENV=py26 - python: 2.7 env: TOXENV=py27 - - python: 3.3 - env: TOXENV=py33 - python: 3.4 env: TOXENV=py34 - python: 3.5 diff --git a/old/uritemplate.py/uritemplatepy-setup.py b/old/uritemplate.py/uritemplatepy-setup.py index 430d519..ebececb 100644 --- a/old/uritemplate.py/uritemplatepy-setup.py +++ b/old/uritemplate.py/uritemplatepy-setup.py @@ -11,6 +11,7 @@ setup( author_email="graffatcolmingov@gmail.com", url="https://uritemplate.readthedocs.org", install_requires=["uritemplate>=2.0"], + python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', classifiers=[ 'Development Status :: 5 - Production/Stable', 'License :: OSI Approved', @@ -19,13 +20,11 @@ setup( 'Intended Audience :: Developers', 'Programming Language :: Python', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.2', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: Implementation :: CPython', ], ) @@ -20,6 +20,7 @@ setup( package_data={'': ['LICENSE', 'LICENSE.APACHE', 'LICENSE.BSD', 'AUTHORS.rst']}, include_package_data=True, + python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', classifiers=[ 'Development Status :: 5 - Production/Stable', 'License :: OSI Approved', @@ -28,11 +29,8 @@ setup( 'Intended Audience :: Developers', 'Programming Language :: Python', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.2', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', @@ -1,9 +1,6 @@ [tox] envlist = - py26, py27, - py32, - py33, py34, py35, py36, diff --git a/uritemplate/variable.py b/uritemplate/variable.py index 1842830..7fb02ff 100644 --- a/uritemplate/variable.py +++ b/uritemplate/variable.py @@ -18,9 +18,9 @@ What do you do? import collections import sys -if (2, 6) <= sys.version_info < (2, 8): +if sys.version_info.major == 2: import urllib -elif (3, 3) <= sys.version_info < (4, 0): +elif sys.version_info.major == 3: import urllib.parse as urllib |