launchpad-reviewers team mailing list archive

[Colin Watson <mp+428032@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:difftacular-0.1 into launchpad:master.

Commit message:
Move difftacular to virtualenv

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

This is now on PyPI, so we don't need to pull it in using the obsolescent "sourcedeps" mechanism.

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

diff --git a/brzplugins/difftacular b/brzplugins/difftacular
deleted file mode 120000
index e34dfd2..0000000
--- a/brzplugins/difftacular
+++ /dev/null
@@ -1 +0,0 @@
-../sourcecode/difftacular
\ No newline at end of file
diff --git a/requirements/launchpad.txt b/requirements/launchpad.txt
index 2b629c1..3cb2ae4 100644
--- a/requirements/launchpad.txt
+++ b/requirements/launchpad.txt
@@ -38,6 +38,7 @@ Cython==0.29.17
 d2to1==0.2.12
 debtcollector==1.22.0
 defusedxml==0.6.0
+difftacular==0.1
 distro==1.4.0
 dkimpy==1.0.4
 dnspython==1.16.0
diff --git a/setup.cfg b/setup.cfg
index 55653ec..806401a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -25,6 +25,7 @@ install_requires =
     celery
     cssutils
     defusedxml
+    difftacular
     distro
     dkimpy[ed25519]
     dohq-artifactory
diff --git a/utilities/sourcedeps.cache b/utilities/sourcedeps.cache
index 13594eb..667a3c6 100644
--- a/utilities/sourcedeps.cache
+++ b/utilities/sourcedeps.cache
@@ -7,10 +7,6 @@
         167,
         "jelmer@xxxxxxxxx-20200530172546-539m8h6nngu17ydi"
     ],
-    "difftacular": [
-        13,
-        "cjwatson@xxxxxxxxxxxxx-20220719085614-z6biyxxapbhbjxi8"
-    ],
     "loggerhead": [
         524,
         "otto-copilot@xxxxxxxxxxxxx-20220711132320-7rtwbh42245yfkba"
diff --git a/utilities/sourcedeps.conf b/utilities/sourcedeps.conf
index a1ec0f3..c771089 100644
--- a/utilities/sourcedeps.conf
+++ b/utilities/sourcedeps.conf
@@ -9,5 +9,4 @@
 
 brz-builder lp:~jelmer/brz-builder/trunk;revno=183
 brz-loom lp:~jelmer/brz-loom/trunk;revno=167
-difftacular lp:~launchpad/difftacular/trunk;revno=13
 loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=524