Add support for Python 3.9. (#908)

* Garden documentation. * Add a bit of migration documentation.
zopefoundation · Oct 8, 2020 · 81ac805 · 81ac805
1 parent de360be
commit 81ac805
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,9 +13,6 @@ matrix:
           env: TOXENV=py38
         - python: "3.9-dev"
           env: TOXENV=py39
-    allow_failures:
-        - python: "3.9-dev"
-          env: TOXENV=py39
 
 install:
     - pip install -U pip setuptools

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -21,6 +21,8 @@ Backwards incompatible changes
 Features
 ++++++++
 
+- Add support for Python 3.9.
+
 - New interface ``Products.PageTemplates.interfaces.IZopeAwareEngine``.
   It can be used as the "provides" of an adapter registration
   to adapt a non ``Zope`` tales engine to an engine to be used

diff --git a/buildout.cfg b/buildout.cfg
@@ -18,10 +18,6 @@ parts =
     requirements
 sources-dir = develop
 auto-checkout =
-    AccessControl
-    Acquisition
-    ExtensionClass
-    RestrictedPython
 
 [testenv]
 PYTHONHASHSEED = random

diff --git a/constraints.txt b/constraints.txt
@@ -1,11 +1,11 @@
-AccessControl==4.2
-Acquisition==4.6
+AccessControl==5.0
+Acquisition==4.7
 AuthEncoding==4.2
 BTrees==4.7.2
 Chameleon==3.8.1
 DateTime==4.3
 DocumentTemplate==3.3
-ExtensionClass==4.4
+ExtensionClass==4.5.0
 Missing==4.1
 MultiMapping==4.1
 Paste==3.4.1
@@ -14,7 +14,7 @@ Persistence==3.0
 Products.BTreeFolder2==4.2
 Products.ZCatalog==5.1
 Record==3.5
-RestrictedPython==5.0
+RestrictedPython==5.1
 SecretStorage==3.1.2
 WSGIProxy2==0.4.6
 WebOb==1.8.6

diff --git a/docs/migrations/index.rst b/docs/migrations/index.rst
@@ -8,3 +8,4 @@ Zope.
    :maxdepth: 2
 
    zope4/index
+   zope5
diff --git a/docs/migrations/zope5.rst b/docs/migrations/zope5.rst
@@ -0,0 +1,16 @@
+Migration from Zope 4 to Zope 5.0
+=================================
+
+Prerequisites
+-------------
+
+* Update your project to run on the latest version of Zope 4.
+* Update your project to run on Python 3.6+.
+* Make sure no deprecation warnings are emitted when running your tests and
+  when running the Zope instance
+
+Migration
+---------
+
+* Switch to use Zope 5.0 by using its dependencies for your project.
+* No additional steps should be necessary if the prerequisites are fulfilled.
diff --git a/docs/news.rst b/docs/news.rst
@@ -18,9 +18,14 @@ about all minor new features and bugs being solved in the latest release.
 What's new in Zope 5
 --------------------
 
+Added support for Python 3.9
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Python 3.9 is now fully supported by Zope 5.
+
 Dropped support for Python 2
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Zope 5 supports Python 3 only, versions 3.6 up through 3.8. All support code
+Zope 5 supports Python 3 only, versions 3.6 up through 3.9. All support code
 and special casing for Python 2, including the use of the ``six`` package, have
 been removed.
 

diff --git a/docs/roadmap.rst b/docs/roadmap.rst
@@ -27,7 +27,7 @@ Zope 4 - stable version
     - 3.8
 
 * Support schedule:
-    - Full support: until Zope 5.0 is released, planned for September 2020
+    - Full support: until Zope 5.0 is released, (October 2020)
     - Bug fixes: until 12/31/2021
     - Security fixes: until 12/31/2022 [2]_
 
@@ -39,11 +39,10 @@ Zope 5 - development version
     - 3.6
     - 3.7
     - 3.8
-    - 3.9 (may wait until Zope 5.1)
+    - 3.9
 
 * Support schedule:
-    - Full support: starting with the Zope 5.0 release, planned
-      for September 2020
+    - Full support: starting with the Zope 5.0 release
     - Bug fixes: TBD
     - Security fixes: TBD
 

diff --git a/requirements-full.txt b/requirements-full.txt
@@ -1,12 +1,12 @@
 -e git+https://github.com/zopefoundation/Zope.git@master#egg=Zope
-AccessControl==4.2
-Acquisition==4.6
+AccessControl==5.0
+Acquisition==4.7
 AuthEncoding==4.2
 BTrees==4.7.2
 Chameleon==3.8.1
 DateTime==4.3
 DocumentTemplate==3.3
-ExtensionClass==4.4
+ExtensionClass==4.5.0
 Missing==4.1
 MultiMapping==4.1
 Paste==3.4.1
@@ -15,7 +15,7 @@ Persistence==3.0
 Products.BTreeFolder2==4.2
 Products.ZCatalog==5.1
 Record==3.5
-RestrictedPython==5.0
+RestrictedPython==5.1
 SecretStorage==3.1.2
 WSGIProxy2==0.4.6
 WebOb==1.8.6

diff --git a/setup.py b/setup.py
@@ -58,6 +58,7 @@ def _read_file(filename):
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",

diff --git a/versions-prod.cfg b/versions-prod.cfg
@@ -4,14 +4,14 @@
 [versions]
 Zope =
 Zope2 = 4.0
-AccessControl = 4.2
-Acquisition = 4.6
+AccessControl = 5.0
+Acquisition = 4.7
 AuthEncoding = 4.2
 BTrees = 4.7.2
 Chameleon = 3.8.1
 DateTime = 4.3
 DocumentTemplate = 3.3
-ExtensionClass = 4.4
+ExtensionClass = 4.5.0
 Missing = 4.1
 MultiMapping = 4.1
 Paste = 3.4.1
@@ -20,7 +20,7 @@ Persistence = 3.0
 Products.BTreeFolder2 = 4.2
 Products.ZCatalog = 5.1
 Record = 3.5
-RestrictedPython = 5.0
+RestrictedPython = 5.1
 SecretStorage = 3.1.2
 WSGIProxy2 = 0.4.6
 WebOb = 1.8.6