summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author赖信涛 <laixintao@users.noreply.github.com>2020-01-16 14:45:16 +0800
committerIrina Truong <i.chernyavska@gmail.com>2020-01-15 22:45:16 -0800
commit8fe316e5376738880c9cf4013f37ff357f428e19 (patch)
tree6f0e8d2efebadc27a4ad0273d3dab6809bf238db
parent77a361966a6cbe73ba153710f10f32cc27d167f5 (diff)
Drop Python 3.4 support (#1141)
* remove python3.4 support. Python 3.4 has reached end-of-life. https://www.python.org/downloads/release/python-340/ * drop maximun version of pytest * update changelog * add laixintao to contributors, delete py34 from tox
-rw-r--r--.travis.yml1
-rw-r--r--changelog.rst3
-rw-r--r--requirements-dev.txt3
-rw-r--r--setup.py1
-rw-r--r--tox.ini2
5 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index bc0e671d..1110b8ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,6 @@ language: python
python:
- "2.7"
- - "3.4"
- "3.5"
- "3.6"
- "3.7"
diff --git a/changelog.rst b/changelog.rst
index 991139be..68d8c1b6 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -14,8 +14,10 @@ Bug fixes:
Internal:
---------
+* Drop Python3.4 support. (Thanks: `laixintao`_)
* Fix dead link in development guide. (Thanks: `BrownShibaDog`_)
+
2.2.0:
======
@@ -1028,3 +1030,4 @@ Improvements:
.. _`Pedro Ferrari`: https://github.com/petobens
.. _`BrownShibaDog`: https://github.com/BrownShibaDog
.. _`thegeorgeous`: https://github.com/thegeorgeous
+.. _`laixintao`: https://github.com/laixintao
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 0f0c0065..7852e8eb 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,5 +1,4 @@
-# The maximum version requirement can be removed once Python 3.4 goes EOL
-pytest>=2.7.0,<=3.0.7
+pytest>=2.7.0
mock>=1.0.1
tox>=1.9.2
behave>=1.2.4
diff --git a/setup.py b/setup.py
index d1d78ec5..8486a618 100644
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,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/tox.ini b/tox.ini
index c8c75517..87bc79cd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py27, py34, py35, py36, py37
+envlist = py27, py35, py36, py37
[testenv]
deps = pytest>=2.7.0,<=3.0.7
mock>=1.0.1