lazr.lifecycle

Merge lp://staging/~gary/lazr.lifecycle/fixbuild into lp://staging/~launchpad-pqm/lazr.lifecycle/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.lifecycle/fixbuild
Merge into: lp://staging/~launchpad-pqm/lazr.lifecycle/trunk
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~gary/lazr.lifecycle/fixbuild
Reviewer Review Type Date Requested Status
Leonard Richardson (community) Approve
Review via email: mp+10883@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Gary Poster (gary) wrote :

This does the usual dance that we've done lately to fix our lazr builds: remove some build dependencies and get the version number from a file.

We also should move trunk from pqm to lazr-developers.

I need a release of this branch to merge my launchpad branch that uses all of our newest lazr releases (lp:~gary/launchpad/lazr-dist).

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

Reviewed, merged, and released. Not registered due to PyPI problems.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2009-03-24 16:23:51 +0000
3+++ .bzrignore 2009-08-29 16:12:02 +0000
4@@ -6,6 +6,7 @@
5 *.egg-info
6 tags
7 TAGS
8+ID
9 build
10 *.egg
11 dist
12
13=== modified file 'MANIFEST.in'
14--- MANIFEST.in 2009-03-24 16:17:11 +0000
15+++ MANIFEST.in 2009-08-29 16:09:41 +0000
16@@ -1,2 +1,4 @@
17+include ez_setup.py
18+recursive-include src *.txt *.pt *.zcml *.xsd
19 exclude MANIFEST.in buildout.cfg bootstrap.py .bzrignore
20 prune _bootstrap
21
22=== modified file 'setup.py'
23--- setup.py 2009-03-24 16:17:11 +0000
24+++ setup.py 2009-08-29 16:09:41 +0000
25@@ -36,9 +36,7 @@
26 return '\n'.join(res)
27 # end generic helpers
28
29-
30-sys.path.insert(0, 'src')
31-from lazr.lifecycle import __version__
32+__version__ = open("src/lazr/lifecycle/version.txt").read().strip()
33
34 setup(
35 name='lazr.lifecycle',
36@@ -74,6 +72,5 @@
37 docs=['Sphinx',
38 'z3c.recipe.sphinxdoc']
39 ),
40- setup_requires=['eggtestinfo', 'setuptools_bzr'],
41 test_suite='lazr.lifecycle.tests',
42 )
43
44=== modified file 'src/lazr/lifecycle/NEWS.txt'
45--- src/lazr/lifecycle/NEWS.txt 2009-03-24 16:17:11 +0000
46+++ src/lazr/lifecycle/NEWS.txt 2009-08-29 16:09:41 +0000
47@@ -2,7 +2,14 @@
48 NEWS for lazr.lifecycle
49 =======================
50
51-1.0 (2009-03-24)
52+1.0 (unreleased)
53+================
54+
55+- Remove build dependencies on bzr and egg_info
56+
57+- remove sys.path hack in setup.py for __version__
58+
59+0.1 (2009-03-24)
60 ================
61
62 - Initial release
63
64=== modified file 'src/lazr/lifecycle/__init__.py'
65--- src/lazr/lifecycle/__init__.py 2009-03-24 16:17:11 +0000
66+++ src/lazr/lifecycle/__init__.py 2009-08-29 16:09:41 +0000
67@@ -14,4 +14,6 @@
68 # You should have received a copy of the GNU Lesser General Public License
69 # along with lazr.lifecycle. If not, see <http://www.gnu.org/licenses/>.
70
71-__version__ = '0.1'
72+import pkg_resources
73+__version__ = pkg_resources.resource_string(
74+ "lazr.lifecycle", "version.txt").strip()
75
76=== added file 'src/lazr/lifecycle/version.txt'
77--- src/lazr/lifecycle/version.txt 1970-01-01 00:00:00 +0000
78+++ src/lazr/lifecycle/version.txt 2009-08-29 16:09:41 +0000
79@@ -0,0 +1,1 @@
80+1.0

Subscribers

People subscribed via source and target branches