Merge branch '2.13' into plone-hotfix20171128-redirect-213

zopefoundation · Dec 1, 2017 · 37c0bfb · 37c0bfb
2 parents 0bd5e02 + 93fa034
commit 37c0bfb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/buildout.cfg b/buildout.cfg
@@ -1,6 +1,7 @@
 [buildout]
 index = https://pypi.python.org/simple/
 extensions = mr.developer
+index = https://pypi.python.org/simple/
 
 allow-hosts =
     *.python.org

diff --git a/doc/CHANGES.rst b/doc/CHANGES.rst
@@ -10,6 +10,10 @@ http://docs.zope.org/zope2/
 
 - Made Redirect unavailable as url.  Part of PloneHotfix20171128.  [maurits]
 
+- set explicit PyPI index, the old ``zc.buildout`` defaults no longer work
+
+- Pin ``pytz`` to prevent unit test failures from ``DateTime``
+
 - Update virtualenv based installation docs to mention pip<8.0 requirement.
 
 - Explicitly require Manager role for ``AltDatabaseManager``.  [maurits]

diff --git a/version_ranges.cfg b/version_ranges.cfg
@@ -99,6 +99,6 @@ mechanize = < 0.3.dev
 python-gettext = < 1.3.dev
 zope.testbrowser = < 3.12.dev
 
-# time zones, 2017.3 gives a test error in DateTime:
+# pytz 2017.3 provokes a test failure in DateTime:
 # AssertionError: legacy timezone  Canada/East-Saskatchewan cannot be looked up
 pytz = < 2017.3