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
=== modified file '.bzrignore'
--- .bzrignore 2009-03-24 16:23:51 +0000
+++ .bzrignore 2009-08-29 16:12:02 +0000
@@ -6,6 +6,7 @@
6*.egg-info6*.egg-info
7tags7tags
8TAGS8TAGS
9ID
9build10build
10*.egg11*.egg
11dist12dist
1213
=== modified file 'MANIFEST.in'
--- MANIFEST.in 2009-03-24 16:17:11 +0000
+++ MANIFEST.in 2009-08-29 16:09:41 +0000
@@ -1,2 +1,4 @@
1include ez_setup.py
2recursive-include src *.txt *.pt *.zcml *.xsd
1exclude MANIFEST.in buildout.cfg bootstrap.py .bzrignore3exclude MANIFEST.in buildout.cfg bootstrap.py .bzrignore
2prune _bootstrap4prune _bootstrap
35
=== modified file 'setup.py'
--- setup.py 2009-03-24 16:17:11 +0000
+++ setup.py 2009-08-29 16:09:41 +0000
@@ -36,9 +36,7 @@
36 return '\n'.join(res)36 return '\n'.join(res)
37# end generic helpers37# end generic helpers
3838
3939__version__ = open("src/lazr/lifecycle/version.txt").read().strip()
40sys.path.insert(0, 'src')
41from lazr.lifecycle import __version__
4240
43setup(41setup(
44 name='lazr.lifecycle',42 name='lazr.lifecycle',
@@ -74,6 +72,5 @@
74 docs=['Sphinx',72 docs=['Sphinx',
75 'z3c.recipe.sphinxdoc']73 'z3c.recipe.sphinxdoc']
76 ),74 ),
77 setup_requires=['eggtestinfo', 'setuptools_bzr'],
78 test_suite='lazr.lifecycle.tests',75 test_suite='lazr.lifecycle.tests',
79 )76 )
8077
=== modified file 'src/lazr/lifecycle/NEWS.txt'
--- src/lazr/lifecycle/NEWS.txt 2009-03-24 16:17:11 +0000
+++ src/lazr/lifecycle/NEWS.txt 2009-08-29 16:09:41 +0000
@@ -2,7 +2,14 @@
2NEWS for lazr.lifecycle2NEWS for lazr.lifecycle
3=======================3=======================
44
51.0 (2009-03-24)51.0 (unreleased)
6================
7
8- Remove build dependencies on bzr and egg_info
9
10- remove sys.path hack in setup.py for __version__
11
120.1 (2009-03-24)
6================13================
714
8- Initial release15- Initial release
916
=== modified file 'src/lazr/lifecycle/__init__.py'
--- src/lazr/lifecycle/__init__.py 2009-03-24 16:17:11 +0000
+++ src/lazr/lifecycle/__init__.py 2009-08-29 16:09:41 +0000
@@ -14,4 +14,6 @@
14# You should have received a copy of the GNU Lesser General Public License14# You should have received a copy of the GNU Lesser General Public License
15# along with lazr.lifecycle. If not, see <http://www.gnu.org/licenses/>.15# along with lazr.lifecycle. If not, see <http://www.gnu.org/licenses/>.
1616
17__version__ = '0.1'17import pkg_resources
18__version__ = pkg_resources.resource_string(
19 "lazr.lifecycle", "version.txt").strip()
1820
=== added file 'src/lazr/lifecycle/version.txt'
--- src/lazr/lifecycle/version.txt 1970-01-01 00:00:00 +0000
+++ src/lazr/lifecycle/version.txt 2009-08-29 16:09:41 +0000
@@ -0,0 +1,1 @@
11.0

Subscribers

People subscribed via source and target branches