Merge branch 'master' into fix-385

CHANGES.rst

@@ -14,6 +14,8 @@ https://github.com/zopefoundation/Zope/blob/4.0a6/CHANGES.rst
 Bugfixes
 ++++++++
 
+- Fix `bin/mkwsgiinstance` on Python 3 when Zope was installed via ``pip``.
+
 - Fix a bug with scopes in scripts with zconsole, which made it impossible to
   reach global imports in the script within a function.
 
@@ -22,6 +24,10 @@ Bugfixes
 
 - Fix zodbupdate conversion of ``OFS.Image.Pdata`` objects.
 
+- Install the `ipaddress` package only on Python 2.7 as it is part of the
+  stdlib in Python 3.
+  (`#368 <https://github.com/zopefoundation/Zope/issues/368>`_)
+
 Other changes
 +++++++++++++
 

setup.py

@@ -75,8 +75,8 @@ def _read_file(filename):
         'RestrictedPython',
         'ZConfig >= 2.9.2',
         'ZODB',
-        'ipaddress',
-        'setuptools',
+        'ipaddress ; python_version=="2.7"',
+        'setuptools >= 36.2',
         'six',
         'transaction',
         'waitress',

src/Zope2/utilities/mkwsgiinstance.py

@@ -217,6 +217,7 @@ def get_zope2path(python):
     try:
         output = subprocess.check_output(
             [python, '-c', 'import Zope2; print(Zope2.__file__)'],
+            universal_newlines=True,  # makes Python 3 return text, not bytes
             stderr=subprocess.PIPE)
         zope2file = output.strip()
     except subprocess.CalledProcessError:

tox.ini

@@ -17,7 +17,8 @@ skip_install = true
 deps =
     -cconstraints.txt
     coverage
-    zc.buildout
+    setuptools>=36.2
+    zc.buildout>=2.12
 setenv =
     COVERAGE_FILE=.coverage.{envname}