launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:dulwich-0.19.16 into launchpad:master.

Commit message:
Upgrade to dulwich 0.19.16

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

This isn't actually used since breezy.git is disabled by lib/lp_sitecustomize.py, but it gets us closer to "pip check" passing.  It's possible to upgrade this now that codeimport is in a separate tree.

Dependencies MP: https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/395852
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:dulwich-0.19.16 into launchpad:master.

diff --git a/lib/lp/scripts/utilities/test.py b/lib/lp/scripts/utilities/test.py
index 3d6753f..5805258 100755
--- a/lib/lp/scripts/utilities/test.py
+++ b/lib/lp/scripts/utilities/test.py
@@ -120,15 +120,6 @@ def filter_warnings():
     warnings.filterwarnings(
         'ignore', 'twisted.python.plugin', DeprecationWarning,
         )
-    # XXX cjwatson 2019-10-18: This can be dropped once the port to Breezy
-    # is complete.
-    warnings.filterwarnings(
-        'ignore',
-        re.escape(
-            'RefsContainer._follow is deprecated. '
-            'Use RefsContainer.follow instead.'),
-        DeprecationWarning, r'dulwich\.refs',
-        )
     # This warning will be triggered if the beforeTraversal hook fails. We
     # want to ensure it is not raised as an error, as this will mask the
     # real problem.
diff --git a/lib/lp_sitecustomize.py b/lib/lp_sitecustomize.py
index d80f76b..76702aa 100644
--- a/lib/lp_sitecustomize.py
+++ b/lib/lp_sitecustomize.py
@@ -190,8 +190,12 @@ def main(instance_name=None):
     grouper = type(list(itertools.groupby([0]))[0][1])
     checker.BasicTypes[grouper] = checker._iteratorChecker
 
-    # XXX 2019-09-17: git must be disabled until codeimport is upgraded,
-    # since the required dulwich versions for our current version of bzr-git
-    # and for Breezy are incompatible in both directions.
+    # XXX cjwatson 2020-11-20: Remove this once we upgrade to a version of
+    # Breezy with
+    # https://code.launchpad.net/~cjwatson/brz/fix-loggerhead-git-option
+    # merged, to avoid https://bugs.launchpad.net/launchpad/+bug/1744830.
+    # (But arguably we might want to figure out a way to disable the git
+    # formats anyway, just in a less crude way, as we don't want to use them
+    # in practice.)
     import types
     sys.modules['breezy.git'] = types.ModuleType('breezy.git')
diff --git a/requirements/launchpad.txt b/requirements/launchpad.txt
index 2ab3280..509d1d7 100644
--- a/requirements/launchpad.txt
+++ b/requirements/launchpad.txt
@@ -36,7 +36,7 @@ defusedxml==0.6.0
 distro==1.4.0
 dkimpy==1.0.4
 dnspython==1.16.0
-dulwich==0.18.6
+dulwich==0.19.16
 eggtestinfo==0.3
 elementtree==1.2.6-20050316
 enum34==1.1.6