summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2018-12-13 14:53:09 -0800
committerJoffrey F <joffrey@docker.com>2019-03-16 09:41:38 -0700
commit55ffb761bffd8b6382332faf3e3375817706c690 (patch)
tree58688853383cd6b43c103965bbf581a72cf2cbff
parent4d7d4084138fa6161ef5f31d410b0d326d41f777 (diff)
downloaddocker-py-terminate_3.3_support.tar.gz
Terminate support for Python 3.3 (EOL in 2018)terminate_3.3_support
Signed-off-by: Joffrey F <joffrey@docker.com>
-rw-r--r--requirements.txt5
-rw-r--r--setup.py6
-rw-r--r--test-requirements.txt6
3 files changed, 5 insertions, 12 deletions
diff --git a/requirements.txt b/requirements.txt
index f1c9bdb..461bf53 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,8 +2,7 @@ appdirs==1.4.3
asn1crypto==0.22.0
backports.ssl-match-hostname==3.5.0.1
cffi==1.10.0
-cryptography==1.9; python_version == '3.3'
-cryptography==2.3; python_version > '3.3'
+cryptography==2.3
docker-pycreds==0.4.0
enum34==1.1.6
idna==2.5
@@ -17,5 +16,5 @@ pypiwin32==219; sys_platform == 'win32' and python_version < '3.6'
pypiwin32==223; sys_platform == 'win32' and python_version >= '3.6'
requests==2.20.0
six==1.10.0
+urllib3==1.24.1
websocket-client==0.40.0
-urllib3==1.21.1; python_version == '3.3' \ No newline at end of file
diff --git a/setup.py b/setup.py
index 94fbdf4..677bc20 100644
--- a/setup.py
+++ b/setup.py
@@ -29,9 +29,6 @@ extras_require = {
':sys_platform == "win32" and python_version < "3.6"': 'pypiwin32==219',
':sys_platform == "win32" and python_version >= "3.6"': 'pypiwin32==223',
- # urllib3 drops support for Python 3.3 in 1.23
- ':python_version == "3.3"': 'urllib3 < 1.23',
-
# If using docker-py over TLS, highly recommend this option is
# pip-installed or pinned.
@@ -75,7 +72,7 @@ setup(
install_requires=requirements,
tests_require=test_requirements,
extras_require=extras_require,
- python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*',
+ python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
zip_safe=False,
test_suite='tests',
classifiers=[
@@ -87,7 +84,6 @@ setup(
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
diff --git a/test-requirements.txt b/test-requirements.txt
index 510fa29..df36988 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,8 +2,6 @@ coverage==4.5.2
flake8==3.6.0; python_version != '3.3'
flake8==3.4.1; python_version == '3.3'
mock==1.0.1
-pytest==2.9.1; python_version == '3.3'
-pytest==4.1.0; python_version != '3.3'
-pytest-cov==2.6.1; python_version != '3.3'
-pytest-cov==2.5.1; python_version == '3.3'
+pytest==4.1.0
+pytest-cov==2.6.1
pytest-timeout==1.3.3