Merge branch 'master' into re-379-revert-repr

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,13 +24,19 @@ 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
 +++++++++++++
 
 - Restore old ``__repr__`` via ``OFS.SimpleItem.PathReprProvider``. Use this
   as first base class for your custom classes, to restore the old behaviour.
   (`#379 <https://github.com/zopefoundation/Zope/issues/379>`_)
 
+- Update dependencies to newest versions.
+
 
 4.0b6 (2018-10-11)
 ------------------

buildout.cfg

@@ -32,7 +32,7 @@ initialization =
     import sys
     import warnings
     warnings.simplefilter('default')
-eggs = Zope
+eggs = Zope[test]
 
 
 [scripts]
@@ -67,7 +67,7 @@ eggs =
     MultiMapping
     Persistence
     zExceptions
-    Zope
+    Zope[test]
 # Test optional dependencies.
     five.localsitemanager
     Missing

constraints.txt

@@ -2,7 +2,7 @@ AccessControl==4.0b6
 Acquisition==4.5
 AuthEncoding==4.0.0
 BTrees==4.5.1
-Chameleon==3.4
+Chameleon==3.5
 DateTime==4.3
 DocumentTemplate==3.0b5
 ExtensionClass==4.4
@@ -16,11 +16,11 @@ Products.ZCatalog==4.2
 Record==3.5
 RestrictedPython==4.0b6
 WSGIProxy2==0.4.5
-WebOb==1.8.2
+WebOb==1.8.3
 WebTest==2.0.32
 ZConfig==3.3.0
 ZEO==5.2.0
-ZODB==5.4.0
+ZODB==5.5.0
 ZServer==4.0b3 ; python_version < '3.0'
 Zope2==4.0b1
 five.globalrequest==99.1
@@ -29,26 +29,26 @@ funcsigs==1.0.2
 future==0.16.0
 ipaddress==1.0.22
 mock==2.0.0
-pbr==4.3.0
-persistent==4.4.2
+pbr==5.0.0
+persistent==4.4.3
 pytz==2018.5
 shutilwhich==1.1.0
 six==1.11.0
-transaction==2.2.1
+transaction==2.3.0
 waitress==1.1.0
 z3c.pt==3.1.0
 zExceptions==4.1
 zc.lockfile==1.3.0
 zdaemon==4.2.0
 zodbpickle==1.0.2
-zope.annotation==4.6.0
+zope.annotation==4.7.0
 zope.browser==2.3
 zope.browsermenu==4.4
 zope.browserpage==4.3.0
 zope.browserresource==4.3
 zope.cachedescriptors==4.3.1
 zope.component==4.5
-zope.componentvocabulary==2.1.0
+zope.componentvocabulary==2.2.0
 zope.configuration==4.3.0
 zope.container==4.2.2
 zope.contentprovider==4.2
@@ -63,28 +63,28 @@ zope.filerepresentation==4.2.0
 zope.formlib==4.5.0
 zope.globalrequest==1.5
 zope.hookable==4.2.0
-zope.i18n==4.4
-zope.i18nmessageid==4.2
+zope.i18n==4.6.0
+zope.i18nmessageid==4.3.1
 zope.interface==4.5.0
 zope.lifecycleevent==4.3.0
 zope.location==4.2
-zope.pagetemplate==4.4
+zope.pagetemplate==4.4.1
 zope.processlifetime==2.3.0
 zope.proxy==4.3.1
 zope.ptresource==4.2.0
-zope.publisher==5.0
+zope.publisher==5.0.1
 zope.ramcache==2.3
-zope.schema==4.9.1
+zope.schema==4.9.3
 zope.security==4.3.0
 zope.sendmail==4.2
 zope.sequencesort==4.1.2
-zope.site==4.2
+zope.site==4.2.2
 zope.size==4.3
 zope.structuredtext==4.3
 zope.tal==4.4
 zope.tales==4.3
 zope.testbrowser==5.3
 zope.testing==4.7
 zope.testrunner==4.9
-zope.traversing==4.3
+zope.traversing==4.3.1
 zope.viewlet==4.2

requirements-full.txt

@@ -3,7 +3,7 @@ AccessControl==4.0b6
 Acquisition==4.5
 AuthEncoding==4.0.0
 BTrees==4.5.1
-Chameleon==3.4
+Chameleon==3.5
 DateTime==4.3
 DocumentTemplate==3.0b5
 ExtensionClass==4.4
@@ -17,38 +17,38 @@ Products.ZCatalog==4.2
 Record==3.5
 RestrictedPython==4.0b6
 WSGIProxy2==0.4.5
-WebOb==1.8.2
+WebOb==1.8.3
 WebTest==2.0.32
 ZConfig==3.3.0
 ZEO==5.2.0
-ZODB==5.4.0
+ZODB==5.5.0
 Zope2==4.0b1
 five.globalrequest==99.1
 five.localsitemanager==3.2.1
 funcsigs==1.0.2
 future==0.16.0
 ipaddress==1.0.22
 mock==2.0.0
-pbr==4.3.0
-persistent==4.4.2
+pbr==5.0.0
+persistent==4.4.3
 pytz==2018.5
 shutilwhich==1.1.0
 six==1.11.0
-transaction==2.2.1
+transaction==2.3.0
 waitress==1.1.0
 z3c.pt==3.1.0
 zExceptions==4.1
 zc.lockfile==1.3.0
 zdaemon==4.2.0
 zodbpickle==1.0.2
-zope.annotation==4.6.0
+zope.annotation==4.7.0
 zope.browser==2.3
 zope.browsermenu==4.4
 zope.browserpage==4.3.0
 zope.browserresource==4.3
 zope.cachedescriptors==4.3.1
 zope.component==4.5
-zope.componentvocabulary==2.1.0
+zope.componentvocabulary==2.2.0
 zope.configuration==4.3.0
 zope.container==4.2.2
 zope.contentprovider==4.2
@@ -63,28 +63,28 @@ zope.filerepresentation==4.2.0
 zope.formlib==4.5.0
 zope.globalrequest==1.5
 zope.hookable==4.2.0
-zope.i18n==4.4
-zope.i18nmessageid==4.2
+zope.i18n==4.6.0
+zope.i18nmessageid==4.3.1
 zope.interface==4.5.0
 zope.lifecycleevent==4.3.0
 zope.location==4.2
-zope.pagetemplate==4.4
+zope.pagetemplate==4.4.1
 zope.processlifetime==2.3.0
 zope.proxy==4.3.1
 zope.ptresource==4.2.0
-zope.publisher==5.0
+zope.publisher==5.0.1
 zope.ramcache==2.3
-zope.schema==4.9.1
+zope.schema==4.9.3
 zope.security==4.3.0
 zope.sendmail==4.2
 zope.sequencesort==4.1.2
-zope.site==4.2
+zope.site==4.2.2
 zope.size==4.3
 zope.structuredtext==4.3
 zope.tal==4.4
 zope.tales==4.3
 zope.testbrowser==5.3
 zope.testing==4.7
 zope.testrunner==4.9
-zope.traversing==4.3
+zope.traversing==4.3.1
 zope.viewlet==4.2

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',
@@ -117,6 +117,11 @@ def _read_file(filename):
         'zope.traversing',
         'zope.viewlet',
     ],
+    extras_require={
+        'test': [
+            'ZODB[test]',
+        ],
+    },
     include_package_data=True,
     zip_safe=False,
     entry_points={

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}
 

versions-prod.cfg

@@ -8,7 +8,7 @@ AccessControl = 4.0b6
 AuthEncoding = 4.0.0
 Acquisition = 4.5
 BTrees = 4.5.1
-Chameleon = 3.4
+Chameleon = 3.5
 DateTime = 4.3
 DocumentTemplate = 3.0b5
 ExtensionClass = 4.4
@@ -21,9 +21,9 @@ Missing = 4.1
 mock = 2.0.0
 MultiMapping = 4.1
 PasteDeploy = 1.5.2
-pbr = 4.3.0
+pbr = 5.0.0
 Persistence = 3.0b4
-persistent = 4.4.2
+persistent = 4.4.3
 Products.BTreeFolder2 = 4.1
 Products.ZCatalog = 4.2
 Products.ZCTextIndex = 4.0.2
@@ -32,9 +32,9 @@ Record = 3.5
 RestrictedPython = 4.0b6
 shutilwhich = 1.1.0
 six = 1.11.0
-transaction = 2.2.1
+transaction = 2.3.0
 waitress = 1.1.0
-WebOb = 1.8.2
+WebOb = 1.8.3
 WebTest = 2.0.32
 WSGIProxy2 = 0.4.5
 z3c.pt = 3.1.0
@@ -43,16 +43,16 @@ ZConfig = 3.3.0
 zdaemon = 4.2.0
 ZEO = 5.2.0
 zExceptions = 4.1
-ZODB = 5.4.0
+ZODB = 5.5.0
 zodbpickle = 1.0.2
-zope.annotation = 4.6.0
+zope.annotation = 4.7.0
 zope.browser = 2.3
 zope.browsermenu = 4.4
 zope.browserpage = 4.3.0
 zope.browserresource = 4.3
 zope.cachedescriptors = 4.3.1
 zope.component = 4.5
-zope.componentvocabulary = 2.1.0
+zope.componentvocabulary = 2.2.0
 zope.configuration = 4.3.0
 zope.container = 4.2.2
 zope.contentprovider = 4.2
@@ -67,29 +67,29 @@ zope.filerepresentation = 4.2.0
 zope.formlib = 4.5.0
 zope.globalrequest = 1.5
 zope.hookable = 4.2.0
-zope.i18n = 4.4
-zope.i18nmessageid = 4.2
+zope.i18n = 4.6.0
+zope.i18nmessageid = 4.3.1
 zope.interface = 4.5.0
 zope.lifecycleevent = 4.3.0
 zope.location = 4.2
-zope.pagetemplate = 4.4
+zope.pagetemplate = 4.4.1
 zope.processlifetime = 2.3.0
 zope.proxy = 4.3.1
 zope.ptresource = 4.2.0
-zope.publisher = 5.0
+zope.publisher = 5.0.1
 zope.ramcache = 2.3
-zope.schema = 4.9.1
+zope.schema = 4.9.3
 zope.security = 4.3.0
 zope.sendmail = 4.2
 zope.sequencesort = 4.1.2
-zope.site = 4.2
+zope.site = 4.2.2
 zope.size = 4.3
 zope.structuredtext = 4.3
 zope.tal = 4.4
 zope.tales = 4.3
 zope.testbrowser = 5.3
 zope.testing = 4.7
 zope.testrunner = 4.9
-zope.traversing = 4.3
+zope.traversing = 4.3.1
 zope.viewlet = 4.2
 ZServer = 4.0b3