launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/pypi-dulwich into lp:launchpad.

Commit message:
Upgrade dulwich to 0.18.6 from PyPI, and bzr-git to r1632.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/pypi-dulwich/+merge/335539

There've been no documented API breaks since William last updated bzr-git for compatibility with the latest dulwich, and this passes the codehosting tests, so this should be reasonably safe; but we should probably try out some git→bzr imports on staging just in case.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/pypi-dulwich into lp:launchpad.

=== modified file 'constraints.txt'
--- constraints.txt	2017-12-19 09:46:14 +0000
+++ constraints.txt	2017-12-22 01:21:42 +0000
@@ -242,6 +242,7 @@
 dkimpy==0.5.4
 # Required by dkimpy
 dnspython==1.10.0
+dulwich==0.18.6
 elementtree==1.2.6-20050316
 epydoc==3.0.1
 extras==0.0.3

=== modified file 'setup.py'
--- setup.py	2017-12-19 09:46:14 +0000
+++ setup.py	2017-12-22 01:21:42 +0000
@@ -155,6 +155,7 @@
         'dkimpy',
         # Required for dkimpy
         'dnspython',
+        'dulwich',
         'FeedParser',
         'feedvalidator',
         'fixtures',

=== modified file 'sourcecode/Makefile'
--- sourcecode/Makefile	2011-11-07 20:29:29 +0000
+++ sourcecode/Makefile	2017-12-22 01:21:42 +0000
@@ -3,7 +3,7 @@
 # the ones we test.  If we fix them all to have EITHER a good makefile
 # (build and check targets work), or no makefile we can reenable auto
 # detection.
-build_dirs:=cscvs dulwich pygettextpo pygpgme subvertpy
+build_dirs:=cscvs pygettextpo pygpgme subvertpy
 test_dirs:=cscvs pygettextpo
 
 TEST_ENV_VARS = PYTHON=$(PYTHON)

=== modified file 'utilities/sourcedeps.cache'
--- utilities/sourcedeps.cache	2016-03-30 08:16:52 +0000
+++ utilities/sourcedeps.cache	2017-12-22 01:21:42 +0000
@@ -4,8 +4,8 @@
         "launchpad@xxxxxxxxxxxxxxxxx-20111114140506-6bmt9isw6lcud7yt"
     ], 
     "bzr-git": [
-        279, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20130821040714-gy6puta8a2r1fkkg"
+        280, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20171222005919-u98ut0f5z2g618um"
     ], 
     "bzr-loom": [
         55, 
@@ -23,10 +23,6 @@
         6, 
         "aaron@xxxxxxxxxxxxxxxx-20100715135013-uoi3q430urx9gwb8"
     ], 
-    "dulwich": [
-        440, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20150619052709-6rmh11o0wdw09bzj"
-    ], 
     "loggerhead": [
         490, 
         "william.grant@xxxxxxxxxxxxx-20160330070547-bbi1jc0pe6mqlquz"
@@ -39,10 +35,6 @@
         977, 
         "launchpad@xxxxxxxxxxxxxxxxx-20130405041235-9ud0xancja2eefd7"
     ], 
-    "mustache.js": [
-        166, 
-        "git-v1:d87d274d4c37e3eb9ec28c2a5775d79bef4328c7"
-    ], 
     "old_xmlplus": [
         4, 
         "sinzui-20090526164636-1swugzupwvjgomo4"
@@ -50,21 +42,5 @@
     "pygettextpo": [
         25, 
         "launchpad@xxxxxxxxxxxxxxxxx-20140116030912-lqm1dtb6a0y4femq"
-    ], 
-    "pygpgme": [
-        49, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20100325120516-q8to5dx3gga4wlvi"
-    ], 
-    "python-debian": [
-        186, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20110329053617-irncjfr14k0m00zp"
-    ], 
-    "subvertpy": [
-        2051, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20120627155818-0m7c94csgij9f1ee"
-    ], 
-    "testresources": [
-        16, 
-        "robertc@xxxxxxxxxxxxxxxxx-20050911111209-ee5da49011cf936a"
     ]
 }
\ No newline at end of file

=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2016-03-30 08:08:23 +0000
+++ utilities/sourcedeps.conf	2017-12-22 01:21:42 +0000
@@ -8,11 +8,10 @@
 #########################################################
 
 bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=70
-bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=279
+bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=280
 bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=55
 bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2725
 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=433
-dulwich lp:~launchpad-pqm/dulwich/devel;revno=440
 difftacular lp:~launchpad/difftacular/trunk;revno=6
 loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=490
 lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=23