Launchpad itself

Merge ~cjwatson/launchpad:brz-builder-0.7.4 into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. brz-builder-0.7.4
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: a24b747ddee9850a644eeb62c06cf89bf8cf4708
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:brz-builder-0.7.4
Merge into: launchpad:master
Diff against target: 160 lines (+13/-16)
11 files modified
lib/lp/code/browser/sourcepackagerecipe.py (+1/-4)
lib/lp/code/configure.zcml (+4/-4)
lib/lp/code/errors.py (+1/-1)
lib/lp/code/model/sourcepackagerecipedata.py (+1/-1)
lib/lp/code/model/tests/test_sourcepackagerecipe.py (+1/-1)
lib/lp/code/tests/helpers.py (+1/-1)
lib/lp/testing/factory.py (+2/-2)
requirements/launchpad.txt (+1/-0)
setup.cfg (+1/-0)
sourcecode/.gitignore (+0/-1)
utilities/sourcedeps.conf (+0/-1)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+428658@code.launchpad.net

Commit message

Move brz-builder to virtualenv

Description of the change

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

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/code/browser/sourcepackagerecipe.py b/lib/lp/code/browser/sourcepackagerecipe.py
2index 89fa7dc..be599c4 100644
3--- a/lib/lp/code/browser/sourcepackagerecipe.py
4+++ b/lib/lp/code/browser/sourcepackagerecipe.py
5@@ -16,10 +16,7 @@ __all__ = [
6 import itertools
7
8 import simplejson
9-from breezy.plugins.builder.recipe import (
10- ForbiddenInstructionError,
11- RecipeParseError,
12-)
13+from brzbuildrecipe.recipe import ForbiddenInstructionError, RecipeParseError
14 from lazr.lifecycle.event import ObjectModifiedEvent
15 from lazr.lifecycle.snapshot import Snapshot
16 from lazr.restful.interface import copy_field, use_template
17diff --git a/lib/lp/code/configure.zcml b/lib/lp/code/configure.zcml
18index 2f6cb44..f28603c 100644
19--- a/lib/lp/code/configure.zcml
20+++ b/lib/lp/code/configure.zcml
21@@ -1256,19 +1256,19 @@
22 />
23 </class>
24 <class
25- class="breezy.plugins.builder.recipe.BaseRecipeBranch">
26+ class="brzbuildrecipe.recipe.BaseRecipeBranch">
27 <allow attributes="name url revspec revid child_branches deb_version __str__" />
28 </class>
29 <class
30- class="breezy.plugins.builder.recipe.RecipeBranch">
31+ class="brzbuildrecipe.recipe.RecipeBranch">
32 <allow attributes="name url revspec revid child_branches __str__" />
33 </class>
34 <class
35- class="breezy.plugins.builder.recipe.MergeInstruction">
36+ class="brzbuildrecipe.recipe.MergeInstruction">
37 <allow attributes="as_tuple recipe_branch nest_path" />
38 </class>
39 <class
40- class="breezy.plugins.builder.recipe.NestInstruction">
41+ class="brzbuildrecipe.recipe.NestInstruction">
42 <allow attributes="as_tuple recipe_branch nest_path" />
43 </class>
44
45diff --git a/lib/lp/code/errors.py b/lib/lp/code/errors.py
46index 6fb3d6f..2fa4a47 100644
47--- a/lib/lp/code/errors.py
48+++ b/lib/lp/code/errors.py
49@@ -68,7 +68,7 @@ __all__ = [
50
51 import http.client
52
53-from breezy.plugins.builder.recipe import RecipeParseError
54+from brzbuildrecipe.recipe import RecipeParseError
55 from lazr.restful.declarations import error_status
56
57 from lp.app.errors import NameLookupFailed, NotFoundError
58diff --git a/lib/lp/code/model/sourcepackagerecipedata.py b/lib/lp/code/model/sourcepackagerecipedata.py
59index 21dc349..9823360 100644
60--- a/lib/lp/code/model/sourcepackagerecipedata.py
61+++ b/lib/lp/code/model/sourcepackagerecipedata.py
62@@ -13,7 +13,7 @@ __all__ = ["SourcePackageRecipeData"]
63 import re
64
65 import six
66-from breezy.plugins.builder.recipe import (
67+from brzbuildrecipe.recipe import (
68 SAFE_INSTRUCTIONS,
69 BaseRecipeBranch,
70 MergeInstruction,
71diff --git a/lib/lp/code/model/tests/test_sourcepackagerecipe.py b/lib/lp/code/model/tests/test_sourcepackagerecipe.py
72index 692a06d..b4352e5 100644
73--- a/lib/lp/code/model/tests/test_sourcepackagerecipe.py
74+++ b/lib/lp/code/model/tests/test_sourcepackagerecipe.py
75@@ -7,7 +7,7 @@ import textwrap
76 from datetime import datetime, timedelta
77
78 import transaction
79-from breezy.plugins.builder.recipe import ForbiddenInstructionError
80+from brzbuildrecipe.recipe import ForbiddenInstructionError
81 from lazr.restfulclient.errors import BadRequest
82 from pytz import UTC
83 from storm.locals import Store
84diff --git a/lib/lp/code/tests/helpers.py b/lib/lp/code/tests/helpers.py
85index 5530675..7f36b61 100644
86--- a/lib/lp/code/tests/helpers.py
87+++ b/lib/lp/code/tests/helpers.py
88@@ -25,7 +25,7 @@ from itertools import count
89
90 import fixtures
91 import transaction
92-from breezy.plugins.builder.recipe import RecipeParser
93+from brzbuildrecipe.recipe import RecipeParser
94 from zope.component import getUtility
95 from zope.security.proxy import removeSecurityProxy
96
97diff --git a/lib/lp/testing/factory.py b/lib/lp/testing/factory.py
98index 68580a4..1f32ed9 100644
99--- a/lib/lp/testing/factory.py
100+++ b/lib/lp/testing/factory.py
101@@ -34,8 +34,8 @@ from textwrap import dedent
102
103 import pytz
104 import six
105-from breezy.plugins.builder.recipe import BaseRecipeBranch
106 from breezy.revision import Revision as BzrRevision
107+from brzbuildrecipe.recipe import BaseRecipeBranch
108 from cryptography.utils import int_to_bytes
109 from launchpadlib.launchpad import Launchpad
110 from lazr.jobrunner.jobrunner import SuspendJobException
111@@ -3861,7 +3861,7 @@ class LaunchpadObjectFactory(ObjectFactory):
112 If no branches are passed, return a recipe text that references an
113 arbitrary branch.
114 """
115- from breezy.plugins.builder.recipe import RecipeParser
116+ from brzbuildrecipe.recipe import RecipeParser
117
118 parser = RecipeParser(self.makeRecipeText(*branches))
119 return parser.parse()
120diff --git a/requirements/launchpad.txt b/requirements/launchpad.txt
121index b1ae70d..49aefdf 100644
122--- a/requirements/launchpad.txt
123+++ b/requirements/launchpad.txt
124@@ -22,6 +22,7 @@ billiard==3.6.4.0
125 bleach==3.3.1
126 bleach-allowlist==1.0.3
127 breezy==3.2.0
128+brz-builder==0.7.4
129 bson==0.5.9
130 boto3==1.16.63
131 botocore==1.19.63
132diff --git a/setup.cfg b/setup.cfg
133index c0aa6b4..ae66b51 100644
134--- a/setup.cfg
135+++ b/setup.cfg
136@@ -22,6 +22,7 @@ install_requires =
137 bleach-allowlist
138 boto3
139 breezy
140+ brz-builder
141 celery
142 cssutils
143 defusedxml
144diff --git a/sourcecode/.gitignore b/sourcecode/.gitignore
145index 4210d2d..8a20307 100644
146--- a/sourcecode/.gitignore
147+++ b/sourcecode/.gitignore
148@@ -1,2 +1 @@
149-brz-builder
150 brz-loom
151diff --git a/utilities/sourcedeps.conf b/utilities/sourcedeps.conf
152index f11b16b..8c371c6 100644
153--- a/utilities/sourcedeps.conf
154+++ b/utilities/sourcedeps.conf
155@@ -7,5 +7,4 @@
156 #### DEPRECATED. NO NEW ITEMS. NO NO NO NO NO NONONONONO
157 #########################################################
158
159-brz-builder lp:~jelmer/brz-builder/trunk;revno=183
160 brz-loom lp:~jelmer/brz-loom/trunk;revno=167

Subscribers

People subscribed via source and target branches

to status/vote changes: