Merge ~cjwatson/launchpad:ztk-20210121 into launchpad:master

[Colin Watson]

Upgrade to ZTK 9cb420f598 (2021-01-21)

This is mainly straightforward, as we'd already taken most of the substantial changes that affect us individually, but we do need a couple of new workarounds:

 * We have to pin bcrypt to 3.1.7; ztk-versions.cfg now prefers 3.2.0 on Python 3, but that drops support for Python 3.5 and hence Python 3 on xenial. This may become more of an issue in future, but for now it's tolerable.

 * zope.interface 5.1.0 caused new failures in two tests related to GitRefDatabaseBackedMixin, I think because of some bare except statements being narrowed to catch only AttributeError. Fixed by explicitly defining __conform__ so that it doesn't fall through to __getattr__ and try to fetch rows from the database while adapting to ITraversable.

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

[Cristian Gonzalez (cristiangsp)]

Looks good!

review: Approve

diff --git a/lib/lp/code/model/gitref.py b/lib/lp/code/model/gitref.py
index 6d5559e..14ef25b 100644
--- a/lib/lp/code/model/gitref.py
+++ b/lib/lp/code/model/gitref.py
@@ -688,6 +688,11 @@ class GitRefDatabaseBackedMixin(GitRefMixin):
     def __hash__(self):
         return hash(self.repository) ^ hash(self.path) ^ hash(self.commit_sha1)
 
+    # zope.interface tries to use this during adaptation (e.g. to
+    # ITraversable), and we don't want that to attempt a database lookup via
+    # __getattr__.
+    __conform__ = None
+
 
 @implementer(IGitRef)
 class GitRefDefault(GitRefDatabaseBackedMixin):
diff --git a/requirements/launchpad.txt b/requirements/launchpad.txt
index 287664c..1317a65 100644
--- a/requirements/launchpad.txt
+++ b/requirements/launchpad.txt
@@ -14,6 +14,9 @@ attrs==19.1.0
 Automat==0.6.0
 backports.functools-lru-cache==1.5
 backports.lzma==0.0.3
+# ztk-versions.cfg uses 3.2.0 on Python 3, but that drops support for Python
+# 3.5.  Pin to 3.1.7 until we no longer care about xenial.
+bcrypt==3.1.7
 beautifulsoup4==4.7.1
 billiard==3.5.0.5
 bleach==3.1.0
@@ -85,7 +88,6 @@ mistune==0.8.3
 mock==1.0.1
 mocker==1.1.1
 monotonic==1.5
-multipart==0.1.1; python_version < "3"
 multipart==0.2.4; python_version >= "3"
 netaddr==0.7.19
 oauth==1.0
@@ -141,7 +143,6 @@ setuptools-scm==3.4.3
 simplejson==3.8.2
 SimpleTAL==4.3; python_version < "3"
 SimpleTAL==5.2; python_version >= "3"
-six==1.15.0
 soupmatchers==0.4
 soupsieve==1.9
 statsd==3.3.0
@@ -181,13 +182,10 @@ zope.app.publication==4.3.1
 zope.app.publisher==4.2.0
 zope.app.server==4.0.0
 zope.app.wsgi==4.3.0
-zope.publisher==6.0.0
-zope.sendmail==5.1
 zope.server==4.0.2
 # lp:~launchpad-committers/zope.session:launchpad
 zope.session==4.3.0+lp1
 zope.testbrowser==5.5.1
-zope.testing==4.8
 # lp:~launchpad-committers/zope.testrunner:launchpad
 zope.testrunner==5.2+lp1
 zope.vocabularyregistry==1.1.1
diff --git a/requirements/ztk-versions.cfg b/requirements/ztk-versions.cfg
index 37a3cfd..f484e39 100644
--- a/requirements/ztk-versions.cfg
+++ b/requirements/ztk-versions.cfg
@@ -9,7 +9,7 @@ zope.browserpage = 4.4.0
 zope.browserresource = 4.4
 zope.cachedescriptors = 4.3.1
 zope.catalog = 4.2.1
-zope.component = 4.6.1
+zope.component = 4.6.2
 zope.componentvocabulary = 2.2.0
 zope.configuration = 4.4.0
 zope.container = 4.4.0
@@ -23,15 +23,15 @@ 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.event = 4.5.0
+zope.exceptions = 4.4
 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.interface = 5.1.0
 zope.intid = 4.3.0
 zope.keyreference = 4.2.0
 zope.lifecycleevent = 4.3
@@ -47,35 +47,36 @@ zope.principalregistry = 4.2.0
 zope.processlifetime = 2.3.0
 zope.proxy = 4.3.5
 zope.ptresource = 4.2.0
-zope.publisher = 5.2.0
+zope.publisher = 6.0.0
 zope.ramcache = 2.3
 zope.schema = 6.0.0
 zope.security = 5.1.1
 zope.securitypolicy = 4.3.1
-zope.sendmail = 5.0
+zope.sendmail = 5.1
 zope.session = 4.3.0
-zope.site = 4.3.0
+zope.site = 4.4.0
 zope.size = 4.3
 zope.structuredtext = 4.3
 zope.tal = 4.4
-zope.tales = 5.0.2
-zope.testing = 4.7
-zope.testrunner = 5.1
+zope.tales = 5.1
+zope.testing = 4.9
+zope.testrunner = 5.2
 zope.traversing = 4.4.1
 zope.viewlet = 4.2.1
 
 # Direct dependencies
-BTrees = 4.7.1
+BTrees = 4.7.2
+multipart = 0.2.3
 persistent = 4.6.4
 python-gettext = 4.0
-pytz = 2019.3
-setuptools = 46.1.3
-six = 1.14.0
+pytz = 2020.1
+setuptools = 50.3.0
+six = 1.15.0
 transaction = 3.0.0
 
 # zope.password needs these
-bcrypt = 3.1.7
-cffi = 1.14.0
+bcrypt = 3.2.0
+cffi = 1.14.3
 pycparser = 2.20
 
 # Python2-only
@@ -85,15 +86,15 @@ RestrictedPython = 3.6.0
 
 # Testing dependencies
 ZConfig = 3.5.0
-ZODB = 5.5.1
+ZODB = 5.6.0
 argparse = 1.4.0
 colorama = 0.4.3
 extras = 1.0.0
 fixtures = 3.0.0
 linecache2 = 1.0.0
 manuel = 1.10.1
-pbr = 5.4.4
-pyparsing = 2.4.6
+pbr = 5.5.0
+pyparsing = 2.4.7
 python-mimeparse = 1.6.0
 python-subunit = 1.4.0
 testtools = 2.4.0
@@ -105,25 +106,25 @@ zodbpickle = 2.0.0
 
 
 # Testing tools
-coverage = 5.0.4
+coverage = 5.3
 nose = 1.3.7
 
 # Documentation dependencies
-Sphinx = 2.4.4
+Sphinx = 3.2.1
 docutils = 0.16
 imagesize = 1.2.0
 alabaster = 0.7.12
 babel = 2.8.0
-Jinja2 = 2.11.1
+Jinja2 = 2.11.2
 MarkupSafe = 1.1.1
-Pygments = 2.6.1
+Pygments = 2.7.1
 snowballstemmer = 2.0.0
-lxml = 4.5.0
+lxml = 4.5.2
 repoze.sphinx.autointerface = 0.8
-requests = 2.23.0
-certifi = 2019.11.28
-urllib3 = 1.25.8
-idna = 2.9
+requests = 2.24.0
+certifi = 2020.6.20
+urllib3 = 1.25.10
+idna = 2.10
 chardet = 3.0.4
 sphinxcontrib-applehelp = 1.0.2
 sphinxcontrib-devhelp = 1.0.2
@@ -132,17 +133,17 @@ sphinxcontrib-jsmath = 1.0.1
 sphinxcontrib-programoutput = 0.16
 sphinxcontrib-qthelp = 1.0.3
 sphinxcontrib-serializinghtml = 1.1.4
-sphinxcontrib-websupport = 1.2.1
-sphinx-rtd-theme = 0.4.3
-packaging = 20.3
-typing = 3.7.4.1
+sphinxcontrib-websupport = 1.2.4
+sphinx-rtd-theme = 0.5.0
+packaging = 20.4
+typing = 3.7.4.3
 z3c.recipe.sphinxdoc = 1.1.0
 
 # ZTK buildout dependencies
 collective.recipe.cmd = 0.11
-mr.developer = 2.0.0
-z3c.checkversions = 1.1
-z3c.recipe.compattest = 1.0
+mr.developer = 2.0.1
+z3c.checkversions = 1.2
+z3c.recipe.compattest = 1.1.0
 zc.buildout = 2.13.3
 zc.recipe.egg = 2.0.7
 zc.recipe.testrunner = 2.1
@@ -150,5 +151,7 @@ zc.recipe.testrunner = 2.1
 [versions:python27]
 Pygments = 2.5.2
 Sphinx = 1.8.5
+bcrypt = 3.1.7
+multipart = 0.1.1
 setuptools = 44.0.0
 sphinxcontrib-websupport = 1.1.2