launchpad-reviewers team mailing list archive

[Colin Watson <mp+428658@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:brz-builder-0.7.4 into launchpad:master.

Commit message:
Move brz-builder to virtualenv

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

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

The import path changes: it's now just an ordinary Python package rather than being artificially treated as a Breezy plugin.

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

diff --git a/lib/lp/code/browser/sourcepackagerecipe.py b/lib/lp/code/browser/sourcepackagerecipe.py
index 89fa7dc..be599c4 100644
--- a/lib/lp/code/browser/sourcepackagerecipe.py
+++ b/lib/lp/code/browser/sourcepackagerecipe.py
@@ -16,10 +16,7 @@ __all__ = [
 import itertools
 
 import simplejson
-from breezy.plugins.builder.recipe import (
-    ForbiddenInstructionError,
-    RecipeParseError,
-)
+from brzbuildrecipe.recipe import ForbiddenInstructionError, RecipeParseError
 from lazr.lifecycle.event import ObjectModifiedEvent
 from lazr.lifecycle.snapshot import Snapshot
 from lazr.restful.interface import copy_field, use_template
diff --git a/lib/lp/code/configure.zcml b/lib/lp/code/configure.zcml
index 2f6cb44..f28603c 100644
--- a/lib/lp/code/configure.zcml
+++ b/lib/lp/code/configure.zcml
@@ -1256,19 +1256,19 @@
        />
   </class>
   <class
-     class="breezy.plugins.builder.recipe.BaseRecipeBranch">
+     class="brzbuildrecipe.recipe.BaseRecipeBranch">
     <allow attributes="name url revspec revid child_branches deb_version __str__" />
   </class>
   <class
-     class="breezy.plugins.builder.recipe.RecipeBranch">
+     class="brzbuildrecipe.recipe.RecipeBranch">
     <allow attributes="name url revspec revid child_branches __str__" />
   </class>
   <class
-     class="breezy.plugins.builder.recipe.MergeInstruction">
+     class="brzbuildrecipe.recipe.MergeInstruction">
     <allow attributes="as_tuple recipe_branch nest_path" />
   </class>
   <class
-     class="breezy.plugins.builder.recipe.NestInstruction">
+     class="brzbuildrecipe.recipe.NestInstruction">
     <allow attributes="as_tuple recipe_branch nest_path" />
   </class>
 
diff --git a/lib/lp/code/errors.py b/lib/lp/code/errors.py
index 6fb3d6f..2fa4a47 100644
--- a/lib/lp/code/errors.py
+++ b/lib/lp/code/errors.py
@@ -68,7 +68,7 @@ __all__ = [
 
 import http.client
 
-from breezy.plugins.builder.recipe import RecipeParseError
+from brzbuildrecipe.recipe import RecipeParseError
 from lazr.restful.declarations import error_status
 
 from lp.app.errors import NameLookupFailed, NotFoundError
diff --git a/lib/lp/code/model/sourcepackagerecipedata.py b/lib/lp/code/model/sourcepackagerecipedata.py
index 21dc349..9823360 100644
--- a/lib/lp/code/model/sourcepackagerecipedata.py
+++ b/lib/lp/code/model/sourcepackagerecipedata.py
@@ -13,7 +13,7 @@ __all__ = ["SourcePackageRecipeData"]
 import re
 
 import six
-from breezy.plugins.builder.recipe import (
+from brzbuildrecipe.recipe import (
     SAFE_INSTRUCTIONS,
     BaseRecipeBranch,
     MergeInstruction,
diff --git a/lib/lp/code/model/tests/test_sourcepackagerecipe.py b/lib/lp/code/model/tests/test_sourcepackagerecipe.py
index 692a06d..b4352e5 100644
--- a/lib/lp/code/model/tests/test_sourcepackagerecipe.py
+++ b/lib/lp/code/model/tests/test_sourcepackagerecipe.py
@@ -7,7 +7,7 @@ import textwrap
 from datetime import datetime, timedelta
 
 import transaction
-from breezy.plugins.builder.recipe import ForbiddenInstructionError
+from brzbuildrecipe.recipe import ForbiddenInstructionError
 from lazr.restfulclient.errors import BadRequest
 from pytz import UTC
 from storm.locals import Store
diff --git a/lib/lp/code/tests/helpers.py b/lib/lp/code/tests/helpers.py
index 5530675..7f36b61 100644
--- a/lib/lp/code/tests/helpers.py
+++ b/lib/lp/code/tests/helpers.py
@@ -25,7 +25,7 @@ from itertools import count
 
 import fixtures
 import transaction
-from breezy.plugins.builder.recipe import RecipeParser
+from brzbuildrecipe.recipe import RecipeParser
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
 
diff --git a/lib/lp/testing/factory.py b/lib/lp/testing/factory.py
index 68580a4..1f32ed9 100644
--- a/lib/lp/testing/factory.py
+++ b/lib/lp/testing/factory.py
@@ -34,8 +34,8 @@ from textwrap import dedent
 
 import pytz
 import six
-from breezy.plugins.builder.recipe import BaseRecipeBranch
 from breezy.revision import Revision as BzrRevision
+from brzbuildrecipe.recipe import BaseRecipeBranch
 from cryptography.utils import int_to_bytes
 from launchpadlib.launchpad import Launchpad
 from lazr.jobrunner.jobrunner import SuspendJobException
@@ -3861,7 +3861,7 @@ class LaunchpadObjectFactory(ObjectFactory):
         If no branches are passed, return a recipe text that references an
         arbitrary branch.
         """
-        from breezy.plugins.builder.recipe import RecipeParser
+        from brzbuildrecipe.recipe import RecipeParser
 
         parser = RecipeParser(self.makeRecipeText(*branches))
         return parser.parse()
diff --git a/requirements/launchpad.txt b/requirements/launchpad.txt
index b1ae70d..49aefdf 100644
--- a/requirements/launchpad.txt
+++ b/requirements/launchpad.txt
@@ -22,6 +22,7 @@ billiard==3.6.4.0
 bleach==3.3.1
 bleach-allowlist==1.0.3
 breezy==3.2.0
+brz-builder==0.7.4
 bson==0.5.9
 boto3==1.16.63
 botocore==1.19.63
diff --git a/setup.cfg b/setup.cfg
index c0aa6b4..ae66b51 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,6 +22,7 @@ install_requires =
     bleach-allowlist
     boto3
     breezy
+    brz-builder
     celery
     cssutils
     defusedxml
diff --git a/sourcecode/.gitignore b/sourcecode/.gitignore
index 4210d2d..8a20307 100644
--- a/sourcecode/.gitignore
+++ b/sourcecode/.gitignore
@@ -1,2 +1 @@
-brz-builder
 brz-loom
diff --git a/utilities/sourcedeps.conf b/utilities/sourcedeps.conf
index f11b16b..8c371c6 100644
--- a/utilities/sourcedeps.conf
+++ b/utilities/sourcedeps.conf
@@ -7,5 +7,4 @@
 ####  DEPRECATED. NO NEW ITEMS. NO NO NO NO NO NONONONONO
 #########################################################
 
-brz-builder lp:~jelmer/brz-builder/trunk;revno=183
 brz-loom lp:~jelmer/brz-loom/trunk;revno=167