summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2019-05-01 19:49:01 -0700
committerJoffrey F <joffrey@docker.com>2019-05-01 19:51:29 -0700
commitbdc954b00963f0b8b6b98f03d7939bd9184d548a (patch)
tree2a96cfff4f2536fbbe683c017a27e6fc7a15d37a
parent1aae20d13abde8fa4747d5f9c4f5b5c22d534925 (diff)
downloaddocker-py-end_3.4_support.tar.gz
Stop supporting EOL Python 3.4end_3.4_support
Signed-off-by: Joffrey F <joffrey@docker.com>
-rw-r--r--.travis.yml2
-rw-r--r--setup.py6
-rw-r--r--test-requirements.txt3
-rw-r--r--tox.ini2
4 files changed, 5 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 1c837a2..577b893 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,6 @@ matrix:
include:
- python: 2.7
env: TOXENV=py27
- - python: 3.4
- env: TOXENV=py34
- python: 3.5
env: TOXENV=py35
- python: 3.6
diff --git a/setup.py b/setup.py
index 3e1afcb..c29787b 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,8 @@ from __future__ import print_function
import codecs
import os
-from setuptools import setup, find_packages
+from setuptools import find_packages
+from setuptools import setup
ROOT_DIR = os.path.dirname(__file__)
SOURCE_DIR = os.path.join(ROOT_DIR)
@@ -71,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.*, !=3.3.*',
+ python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
zip_safe=False,
test_suite='tests',
classifiers=[
@@ -83,7 +84,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',
diff --git a/test-requirements.txt b/test-requirements.txt
index df36988..b89f646 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,6 +1,5 @@
coverage==4.5.2
-flake8==3.6.0; python_version != '3.3'
-flake8==3.4.1; python_version == '3.3'
+flake8==3.6.0
mock==1.0.1
pytest==4.1.0
pytest-cov==2.6.1
diff --git a/tox.ini b/tox.ini
index 5396147..df797f4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py27, py34, py35, py36, py37, flake8
+envlist = py27, py35, py36, py37, flake8
skipsdist=True
[testenv]