launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:ztk-20200403 into launchpad:master.

Commit message:
Upgrade ZTK packages to 2020-04-03 versions

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/382875

Dependencies MP: https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/382870

My main interest in this is that it fixes https://github.com/zopefoundation/zope.interface/issues/141 which causes lots of problems for Launchpad on Python 3, but it's good to keep things current anyway.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:ztk-20200403 into launchpad:master.

diff --git a/constraints.txt b/constraints.txt
index ebe72da..8fd82dd 100644
--- a/constraints.txt
+++ b/constraints.txt
@@ -11,84 +11,83 @@ zope.applicationcontrol==4.2.0
 zope.authentication==4.4.0
 zope.browser==2.3
 zope.browsermenu==4.4
-zope.browserpage==4.3.0
-zope.browserresource==4.3
+zope.browserpage==4.4.0
+zope.browserresource==4.4
 zope.cachedescriptors==4.3.1
 zope.catalog==4.2.1
-zope.component==4.5
+zope.component==4.6.1
 zope.componentvocabulary==2.2.0
-zope.configuration==4.3.1
-zope.container==4.2.2
+zope.configuration==4.4.0
+zope.container==4.4.0
 zope.contentprovider==4.2.1
-zope.contenttype==4.4
+zope.contenttype==4.5.0
 zope.copy==4.2
 zope.copypastemove==4.1.0
 zope.datetime==4.2.0
-zope.deferredimport==4.3
+zope.deferredimport==4.3.1
 zope.deprecation==4.4.0
 zope.dottedname==4.3
 zope.dublincore==4.2.0
 zope.error==4.5.0
 zope.event==4.4
 zope.exceptions==4.3
-zope.filerepresentation==4.2.0
-zope.formlib==4.6.0
-zope.hookable==4.2.0
-zope.i18n==4.6.2
-zope.i18nmessageid==4.3.1
-zope.index==4.4.0
-zope.interface==4.6.0
+zope.filerepresentation==5.0.0
+zope.formlib==4.7.1
+zope.hookable==5.0.1
+zope.i18n==4.7.0
+zope.i18nmessageid==5.0.1
+zope.index==5.0.0
+zope.interface==5.0.2
 zope.intid==4.3.0
 zope.keyreference==4.2.0
 zope.lifecycleevent==4.3
 zope.location==4.2
 zope.login==2.1.0
-zope.mimetype==2.4.0
+zope.mimetype==2.5.0
 zope.minmax==2.2.0
-zope.pagetemplate==4.4.1
+zope.pagetemplate==4.5.0
 zope.password==4.3.1
 zope.pluggableauth==2.3.0
 zope.principalannotation==4.3.0
 zope.principalregistry==4.2.0
 zope.processlifetime==2.3.0
-zope.proxy==4.3.1
+zope.proxy==4.3.5
 zope.ptresource==4.2.0
-zope.publisher==5.0.1
+zope.publisher==5.2.0
 zope.ramcache==2.3
-zope.schema==4.9.3
-zope.security==4.3.1
+zope.schema==6.0.0
+zope.security==5.1.1
 zope.securitypolicy==4.3.1
 zope.sendmail==5.0
 #zope.session==4.3.0
 # lp:~launchpad-committers/zope.session:launchpad
 zope.session==4.3.0+lp1
-zope.site==4.2.2
+zope.site==4.3.0
 zope.size==4.3
 zope.structuredtext==4.3
 zope.tal==4.4
-zope.tales==5.0
+zope.tales==5.0.2
 zope.testing==4.7
-#zope.testrunner==5.0
+#zope.testrunner==5.1
 # lp:~launchpad-committers/zope.testrunner:launchpad
 zope.testrunner==5.1+lp2
-zope.traversing==4.3.1
+zope.traversing==4.4.1
 zope.viewlet==4.2.1
 
 # Direct dependencies
-BTrees==4.5.1
-persistent==4.4.3
+BTrees==4.7.1
+persistent==4.6.4
 python-gettext==4.0
-pytz==2018.9
+pytz==2019.3
 # Handled in setup-requirements.txt instead.
-#setuptools==41.0.0
-#six==1.12.0
+#setuptools==44.0.0
 six==1.14.0
-transaction==2.4.0
+transaction==3.0.0
 
 # zope.password needs these
-bcrypt==3.1.6
-cffi==1.12.2
-pycparser==2.19
+bcrypt==3.1.7
+cffi==1.14.0
+pycparser==2.20
 
 # Python2-only
 zope.untrustedpython==4.0.0
@@ -96,57 +95,60 @@ zope.untrustedpython==4.0.0
 RestrictedPython==3.6.0
 
 # Testing dependencies
-ZConfig==3.4.0
+ZConfig==3.5.0
 ZODB==5.5.1
 argparse==1.4.0
-colorama==0.4.1
+colorama==0.4.3
 extras==1.0.0
 fixtures==3.0.0
 linecache2==1.0.0
 manuel==1.10.1
-pbr==5.1.3
-pyparsing==2.4.0
+pbr==5.4.4
+pyparsing==2.4.6
 python-mimeparse==1.6.0
-python-subunit==1.3.0
-testtools==2.3.0
+python-subunit==1.4.0
+testtools==2.4.0
 traceback2==1.4.0
 #unittest2==1.1.0
 # lp1 Set version directly in setup.py to fix wheel building.
 unittest2==1.1.0+lp1
-zc.lockfile==1.4
+zc.lockfile==2.0
 zdaemon==4.3
-zodbpickle==1.0.3
+zodbpickle==2.0.0
 
 
 # Testing tools
-coverage==4.5.3
+coverage==5.0.4
 nose==1.3.7
 
 # Documentation dependencies
-# We have to keep a version < 2 to still support Python 2
 Sphinx==1.8.5
-docutils==0.14
-imagesize==1.1.0
+docutils==0.16
+imagesize==1.2.0
 alabaster==0.7.12
-babel==2.6.0
-Jinja2==2.10.1
+babel==2.8.0
+Jinja2==2.11.1
 MarkupSafe==1.1.1
-Pygments==2.3.1
-snowballstemmer==1.2.1
-lxml==4.4.1
+Pygments==2.5.2
+snowballstemmer==2.0.0
+lxml==4.5.0
 repoze.sphinx.autointerface==0.8
-#requests==2.21.0
-requests==2.22.0
-certifi==2019.3.9
-#urllib3==1.24.1
-urllib3==1.25.3
-idna==2.8
+requests==2.23.0
+certifi==2019.11.28
+urllib3==1.25.8
+idna==2.9
 chardet==3.0.4
-sphinxcontrib-programoutput==0.14
-sphinxcontrib-websupport==1.1.0
+sphinxcontrib-applehelp==1.0.2
+sphinxcontrib-devhelp==1.0.2
+sphinxcontrib-htmlhelp==1.0.3
+sphinxcontrib-jsmath==1.0.1
+sphinxcontrib-programoutput==0.16
+sphinxcontrib-qthelp==1.0.3
+sphinxcontrib-serializinghtml==1.1.4
+sphinxcontrib-websupport==1.1.2
 sphinx-rtd-theme==0.4.3
-packaging==19.0
-typing==3.6.6
+packaging==20.3
+typing==3.7.4.1
 z3c.recipe.sphinxdoc==1.1.0
 
 # ZTK buildout dependencies
@@ -154,9 +156,9 @@ collective.recipe.cmd==0.11
 mr.developer==2.0.0
 z3c.checkversions==1.1
 z3c.recipe.compattest==1.0
-zc.buildout==2.13.1
+zc.buildout==2.13.3
 zc.recipe.egg==2.0.7
-zc.recipe.testrunner==2.0.0
+zc.recipe.testrunner==2.1
 
 # Launchpad
 # ---------
@@ -170,7 +172,6 @@ appdirs==1.4.3
 asn1crypto==0.23.0
 attrs==19.1.0
 Automat==0.6.0
-Babel==2.5.1
 backports.functools-lru-cache==1.5
 backports.lzma==0.0.3
 beautifulsoup4==4.7.1
diff --git a/lib/lp/services/feeds/doc/feeds.txt b/lib/lp/services/feeds/doc/feeds.txt
index 02315cb..c0c1178 100644
--- a/lib/lp/services/feeds/doc/feeds.txt
+++ b/lib/lp/services/feeds/doc/feeds.txt
@@ -71,7 +71,9 @@ found.
     >>> verifyObject(IThing, thing)
     Traceback (most recent call last):
       ...
-    DoesNotImplement: ...
+    MultipleInvalid: ...
+    Does not declaratively implement the interface
+    The lp.services.feeds.tests.helper.IThing.value attribute was not provided
     >>> feed_view = getMultiAdapter((thing, request), name='thing-feed.atom')
     Traceback (most recent call last):
       ...
diff --git a/lib/lp/services/tests/test_timeout.py b/lib/lp/services/tests/test_timeout.py
index 33cdcdf..55db5bb 100644
--- a/lib/lp/services/tests/test_timeout.py
+++ b/lib/lp/services/tests/test_timeout.py
@@ -1,4 +1,4 @@
-# Copyright 2012-2019 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """timeout.py tests.
@@ -408,10 +408,10 @@ class TestTimeout(TestCase):
 
     def test_urlfetch_does_not_support_ftp_urls_by_default(self):
         """urlfetch() does not support ftp urls by default."""
-        url = 'ftp://localhost/'
+        url = u'ftp://localhost/'
         e = self.assertRaises(InvalidSchema, urlfetch, url)
         self.assertEqual(
-            "No connection adapters were found for '%s'" % url, str(e))
+            "No connection adapters were found for {!r}".format(url), str(e))
 
     def test_urlfetch_supports_ftp_urls_if_allow_ftp(self):
         """urlfetch() supports ftp urls via a proxy if explicitly asked."""
@@ -444,10 +444,10 @@ class TestTimeout(TestCase):
         """urlfetch() does not support file urls by default."""
         test_path = self.useFixture(TempDir()).join('file')
         write_file(test_path, b'')
-        url = 'file://' + test_path
+        url = u'file://' + test_path
         e = self.assertRaises(InvalidSchema, urlfetch, url)
         self.assertEqual(
-            "No connection adapters were found for '%s'" % url, str(e))
+            "No connection adapters were found for {!r}".format(url), str(e))
 
     def test_urlfetch_supports_file_urls_if_allow_file(self):
         """urlfetch() supports file urls if explicitly asked to do so."""