lazr.enum

Merge lp://staging/~gary/lazr.enum/fixbuild into lp://staging/~launchpad-pqm/lazr.enum/trunk

  1. fixbuild
  2. Merge into trunk
Proposed by Gary Poster
Status: Merged
Merge reported by: Robert Collins
Merged at revision: not available
Proposed branch: lp://staging/~gary/lazr.enum/fixbuild
Merge into: lp://staging/~launchpad-pqm/lazr.enum/trunk
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~gary/lazr.enum/fixbuild
Reviewer Review Type Date Requested Status
Leonard Richardson (community) Approve
Review via email: mp+10938@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Gary Poster (gary) wrote :

This removes the build dependencies on bzr that we've seen in the other lazr.* branches.

We should move the trunk to ~lazr-developers too.

Thank you

Gary

Revision history for this message
Leonard Richardson (leonardr) wrote :

> This removes the build dependencies on bzr that we've seen in the other lazr.*
> branches.
>
> We should move the trunk to ~lazr-developers too.
>
> Thank you
>
> Gary

Reviewed, merged, and released (modulo setup.py register).

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MANIFEST.in'
2--- MANIFEST.in 2009-03-24 14:12:06 +0000
3+++ MANIFEST.in 2009-08-31 19:30:41 +0000
4@@ -1,2 +1,4 @@
5+include ez_setup.py
6+recursive-include src *.txt *.pt *.zcml *.xsd
7 exclude MANIFEST.in buildout.cfg bootstrap.py .bzrignore
8 prune _bootstrap
9
10=== modified file 'setup.py'
11--- setup.py 2009-08-06 20:18:05 +0000
12+++ setup.py 2009-08-31 19:30:41 +0000
13@@ -77,6 +77,5 @@
14 docs=['Sphinx',
15 'z3c.recipe.sphinxdoc']
16 ),
17- setup_requires=['eggtestinfo', 'setuptools_bzr'],
18 test_suite='lazr.enum.tests',
19 )
20
21=== modified file 'src/lazr/enum/NEWS.txt'
22--- src/lazr/enum/NEWS.txt 2009-08-06 20:18:05 +0000
23+++ src/lazr/enum/NEWS.txt 2009-08-31 19:30:41 +0000
24@@ -2,6 +2,11 @@
25 NEWS for lazr.enum
26 ==================
27
28+1.1.2 (unreleased)
29+==================
30+
31+- removed unnecessary build dependencies
32+
33 1.1.1 (2009-08-06)
34 ==================
35
36
37=== modified file 'src/lazr/enum/__init__.py'
38--- src/lazr/enum/__init__.py 2009-08-06 20:18:05 +0000
39+++ src/lazr/enum/__init__.py 2009-08-31 19:30:41 +0000
40@@ -19,18 +19,13 @@
41 __version__ = pkg_resources.resource_string(
42 "lazr.enum", "version.txt").strip()
43
44-# Re-export in such a way that __version__ can still be imported if
45-# dependencies are not yet available.
46-try:
47- # While we generally frown on "*" imports, this, combined with the fact we
48- # only test code from this module, means that we can verify what has been
49- # exported.
50- from lazr.enum._enum import *
51- from lazr.enum._enum import __all__ as _all
52- from lazr.enum.interfaces import *
53- from lazr.enum.interfaces import __all__ as _iall
54- __all__ = []
55- __all__.extend(_all)
56- __all__.extend(_iall)
57-except ImportError:
58- pass
59+# While we generally frown on "*" imports, this, combined with the fact we
60+# only test code from this module, means that we can verify what has been
61+# exported.
62+from lazr.enum._enum import *
63+from lazr.enum._enum import __all__ as _all
64+from lazr.enum.interfaces import *
65+from lazr.enum.interfaces import __all__ as _iall
66+__all__ = []
67+__all__.extend(_all)
68+__all__.extend(_iall)
69
70=== modified file 'src/lazr/enum/version.txt'
71--- src/lazr/enum/version.txt 2009-08-06 20:18:05 +0000
72+++ src/lazr/enum/version.txt 2009-08-31 19:30:41 +0000
73@@ -1,1 +1,1 @@
74-1.1.1
75+1.1.2

Subscribers

People subscribed via source and target branches