Merge pull request #2203 from docker/terminate_3.3_support

[4.0] Terminate support for Python 3.3 (EOL in 2018)

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

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',

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