From e4b580e79ba4545647fec8aa3d8e3f7c91571784 Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Sat, 17 Aug 2019 14:59:57 +0300
Subject: [PATCH 1/2] Drop support for Python 3.4

---
 .manylinux-install.sh |  1 -
 .travis.yml           |  5 -----
 CHANGES.rst           |  4 ++--
 appveyor.yml          |  2 --
 setup.py              | 14 ++++++++------
 tox.ini               |  4 ++--
 6 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/.manylinux-install.sh b/.manylinux-install.sh
index bd4b2a5b..32e53e2e 100755
--- a/.manylinux-install.sh
+++ b/.manylinux-install.sh
@@ -5,7 +5,6 @@ set -e -x
 # Compile wheels
 for PYBIN in /opt/python/*/bin; do
     if [[ "${PYBIN}" == *"cp27"* ]] || \
-       [[ "${PYBIN}" == *"cp34"* ]] || \
        [[ "${PYBIN}" == *"cp35"* ]] || \
        [[ "${PYBIN}" == *"cp36"* ]] || \
        [[ "${PYBIN}" == *"cp37"* ]]; then
diff --git a/.travis.yml b/.travis.yml
index a752c349..58521963 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,6 @@ matrix:
     include:
         - os: linux
           python: 2.7
-        - os: linux
-          python: 3.4
         - os: linux
           python: 3.5
         - os: linux
@@ -24,9 +22,6 @@ matrix:
         - os: osx
           language: generic
           env: TERRYFY_PYTHON='macpython 2.7'
-        - os: osx
-          language: generic
-          env: TERRYFY_PYTHON='macpython 3.4'
         - os: osx
           language: generic
           env: TERRYFY_PYTHON='macpython 3.5'
diff --git a/CHANGES.rst b/CHANGES.rst
index 17c80512..fcdbafc1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,10 +1,10 @@
 Changes
 =======
 
-4.6.1 (unreleased)
+4.7.0 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Drop support for Python 3.4.
 
 
 4.6.0 (2018-10-23)
diff --git a/appveyor.yml b/appveyor.yml
index f7755344..29132295 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,8 +7,6 @@ environment:
   matrix:
     - python: 27
     - python: 27-x64
-    - python: 34
-    - python: 34-x64
     - python: 35
     - python: 35-x64
     - python: 36
diff --git a/setup.py b/setup.py
index 8e38555a..3f437718 100644
--- a/setup.py
+++ b/setup.py
@@ -55,10 +55,11 @@ def _unavailable(self, e):
         An optional code optimization (C extension) could not be compiled.
 
         Optimizations for this package will not be available!""")
-        print()
+        print("")
         print(e)
         print('*' * 80)
 
+
 codeoptimization_c = os.path.join('src', 'zope', 'interface',
                                   '_zope_interface_coptimizations.c')
 codeoptimization = Feature(
@@ -90,14 +91,15 @@ def read(*rnames):
     with open(os.path.join(os.path.dirname(__file__), *rnames)) as f:
         return f.read()
 
-long_description=(
+
+long_description = (
         read('README.rst')
         + '\n' +
         read('CHANGES.rst')
         )
 
 setup(name='zope.interface',
-      version='4.6.1.dev0',
+      version='4.7.0.dev0',
       url='https://github.com/zopefoundation/zope.interface',
       license='ZPL 2.1',
       description='Interfaces for Python',
@@ -113,7 +115,6 @@ def read(*rnames):
         "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",
@@ -133,13 +134,14 @@ def read(*rnames):
       zip_safe=False,
       tests_require=tests_require,
       install_requires=['setuptools'],
-      python_requires=', '.join((
+      python_requires=', '.join([
           '>=2.7',
           '!=3.0.*',
           '!=3.1.*',
           '!=3.2.*',
           '!=3.3.*',
-          )),
+          '!=3.4.*',
+      ]),
       extras_require={
           'docs': ['Sphinx', 'repoze.sphinx.autointerface'],
           'test': tests_require,
diff --git a/tox.ini b/tox.ini
index 9f9ae39a..13fa4449 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py27-pure,py34,py34-pure,py35,py36,py37,pypy,pypy3,coverage,docs
+    py27,py27-pure,py35,py35-pure,py36,py37,pypy,pypy3,coverage,docs
 
 [testenv]
 commands =
@@ -16,7 +16,7 @@ setenv =
     PURE_PYTHON=1
     PIP_CACHE_DIR = {envdir}/.cache
 
-[testenv:py34-pure]
+[testenv:py35-pure]
 setenv =
     PURE_PYTHON=1
     PIP_CACHE_DIR = {envdir}/.cache

From d952fc3b3008ab201fdb749918a6da0462557d6a Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Sun, 18 Aug 2019 18:10:38 +0300
Subject: [PATCH 2/2] Make tox -p auto handle coverage right

BTW I had some problems using tox -p auto before I started passing
--parallel-safe-build.  I'm not sure why that isn't on by default.
---
 tox.ini | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tox.ini b/tox.ini
index 13fa4449..84507cab 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,8 @@
 [tox]
 envlist =
     py27,py27-pure,py35,py35-pure,py36,py37,pypy,pypy3,coverage,docs
+# NB: if you add new environments, please also add them to depends in
+# testenv:coverage so that parallel runs (tox -p auto) will work correctly
 
 [testenv]
 commands =
@@ -36,6 +38,8 @@ commands =
     coverage report
     coverage html
     coverage xml
+depends = py27,py27-pure,py35,py35-pure,py36,py37,pypy,pypy3
+parallel_show_output = true
 
 [testenv:docs]
 basepython =