← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/launchpad:brz-loom-3.0.0 into launchpad:master

 

Colin Watson has proposed merging ~cjwatson/launchpad:brz-loom-3.0.0 into launchpad:master.

Commit message:
Move brz-loom to virtualenv

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1016339 in Launchpad itself: "our bzr/brz plugins are in sourcecode/"
  https://bugs.launchpad.net/launchpad/+bug/1016339

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

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

The list of sourcedeps is now empty, but the machinery for processing it is still present; it will be removed in a later branch.

Dependencies MP: https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/428722
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:brz-loom-3.0.0 into launchpad:master.
diff --git a/brzplugins/builder b/brzplugins/builder
deleted file mode 120000
index 2877987..0000000
--- a/brzplugins/builder
+++ /dev/null
@@ -1 +0,0 @@
-../sourcecode/brz-builder/brzbuildrecipe
\ No newline at end of file
diff --git a/brzplugins/loom b/brzplugins/loom
deleted file mode 120000
index ed0b36f..0000000
--- a/brzplugins/loom
+++ /dev/null
@@ -1 +0,0 @@
-../sourcecode/brz-loom
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index ae66b51..e1a8c8f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,6 +23,7 @@ install_requires =
     boto3
     breezy
     brz-builder
+    brz-loom
     celery
     cssutils
     defusedxml
diff --git a/sourcecode/.gitignore b/sourcecode/.gitignore
deleted file mode 100644
index 8a20307..0000000
--- a/sourcecode/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-brz-loom
diff --git a/utilities/sourcedeps.cache b/utilities/sourcedeps.cache
index 12eb987..9e26dfe 100644
--- a/utilities/sourcedeps.cache
+++ b/utilities/sourcedeps.cache
@@ -1,10 +1 @@
-{
-    "brz-builder": [
-        183,
-        "jelmer@xxxxxxxxx-20200222161141-3tp7u18m15jqd4g8"
-    ],
-    "brz-loom": [
-        167,
-        "jelmer@xxxxxxxxx-20200530172546-539m8h6nngu17ydi"
-    ]
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/utilities/sourcedeps.conf b/utilities/sourcedeps.conf
index 8c371c6..e37f376 100644
--- a/utilities/sourcedeps.conf
+++ b/utilities/sourcedeps.conf
@@ -6,5 +6,3 @@
 #########################################################
 ####  DEPRECATED. NO NEW ITEMS. NO NO NO NO NO NONONONONO
 #########################################################
-
-brz-loom lp:~jelmer/brz-loom/trunk;revno=167