Merge lp:~allenap/maas/lxml-not-a-test-dep into lp:~maas-committers/maas/trunk

Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: no longer in the source branch.
Merged at revision: 1058
Proposed branch: lp:~allenap/maas/lxml-not-a-test-dep
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 23 lines (+0/-2)
2 files modified
buildout.cfg (+0/-1)
versions.cfg (+0/-1)
To merge this branch: bzr merge lp:~allenap/maas/lxml-not-a-test-dep
Reviewer Review Type Date Requested Status
Raphaël Badin (community) Approve
Review via email: mp+125969@code.launchpad.net

Commit message

Remove lxml from buildout's control.

lxml is a production dependency, and as such it should no longer be managed by buildout.

To post a comment you must log in.
Revision history for this message
Raphaël Badin (rvb) :
review: Approve
Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 9/24/2012 2:48 PM, Gavin Panella wrote:
> Gavin Panella has proposed merging
> lp:~allenap/maas/lxml-not-a-test-dep into lp:maas.
>
> Commit message: Remove lxml from buildout's control.
>
> lxml is a production dependency, and as such it should no longer be
> managed by buildout.
>
> Requested reviews: MAAS Maintainers (maas-maintainers)
>
> For more details, see:
> https://code.launchpad.net/~allenap/maas/lxml-not-a-test-dep/+merge/125969
>
>
review: approve

We'd like it for the lshw code as well.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (Cygwin)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iEYEARECAAYFAlBgRi0ACgkQJdeBCYSNAAP1VgCcCi30UCvn9jo4EK6CSlXMw+AK
PkYAniblUII8bsWaUu+hZ8F/cKEbUVdu
=7g4S
-----END PGP SIGNATURE-----

Revision history for this message
Julian Edwards (julian-edwards) wrote :

Don't forget these simple things for the precise branch too.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'buildout.cfg'
2--- buildout.cfg 2012-09-22 15:38:25 +0000
3+++ buildout.cfg 2012-09-24 10:46:13 +0000
4@@ -33,7 +33,6 @@
5 test-eggs =
6 coverage
7 fixtures
8- lxml
9 mock
10 nose
11 nose-subunit
12
13=== modified file 'versions.cfg'
14--- versions.cfg 2012-09-22 15:38:25 +0000
15+++ versions.cfg 2012-09-24 10:46:13 +0000
16@@ -9,7 +9,6 @@
17 Jinja2 = 2.6
18 Pygments = 1.4
19 Sphinx = 1.1.3
20-lxml = 2.3.5
21
22 [versions-dev]
23 # Bug 251 is problematic in 0.9.2.