Merge branch 'master' into testing-response-headers-docs

twisted · Jun 3, 2019 · 84f1c81 · 84f1c81
2 parents 9dd8c2f + eeb4d62
commit 84f1c81
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,10 +15,6 @@ matrix:
       env: TOXENV=py27-twisted_lowest
     - python: '2.7'
       env: TOXENV=py27-twisted_latest
-    - python: '3.4'
-      env: TOXENV=py34-twisted_lowest
-    - python: '3.4'
-      env: TOXENV=py34-twisted_latest
     - python: '3.5'
       env: TOXENV=py35-twisted_lowest
     - python: '3.5'
@@ -39,8 +35,6 @@ matrix:
       env: TOXENV=pypy-twisted_trunk-pyopenssl_trunk
     - python: '2.7'
       env: TOXENV=py27-twisted_trunk-pyopenssl_trunk
-    - python: '3.4'
-      env: TOXENV=py34-twisted_trunk-pyopenssl_trunk
     - python: '3.5'
       env: TOXENV=py35-twisted_trunk-pyopenssl_trunk
     - python: '3.6'
@@ -62,7 +56,6 @@ matrix:
   allow_failures:
     - env: TOXENV=pypy-twisted_trunk-pyopenssl_trunk
     - env: TOXENV=py27-twisted_trunk-pyopenssl_trunk
-    - env: TOXENV=py34-twisted_trunk-pyopenssl_trunk
     - env: TOXENV=py35-twisted_trunk-pyopenssl_trunk
     - env: TOXENV=py36-twisted_trunk-pyopenssl_trunk
     - env: TOXENV=py37-twisted_trunk-pyopenssl_trunk

diff --git a/setup.py b/setup.py
@@ -8,7 +8,6 @@
     "Framework :: Twisted",
     "Programming Language :: Python",
     "Programming Language :: Python :: 2.7",
-    "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
@@ -1,7 +1,7 @@
 [tox]
 envlist =
-        {pypy,py27,py34,py35,py36,py37}-twisted_{lowest,latest},
-        {pypy,py27,py34,py35,py36,py37}-twisted_trunk-pyopenssl_trunk,
+        {pypy,py27,py35,py36,py37}-twisted_{lowest,latest},
+        {pypy,py27,py35,py36,py37}-twisted_trunk-pyopenssl_trunk,
         pypi-readme, check-manifest, flake8, docs
 
 [testenv]