lazr.batchnavigator

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

  1. fixbuild
  2. Merge into trunk
Proposed by Gary Poster
Status: Merged
Merge reported by: Gavin Panella
Merged at revision: not available
Proposed branch: lp://staging/~gary/lazr.batchnavigator/fixbuild
Merge into: lp://staging/~launchpad-pqm/lazr.batchnavigator/trunk
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~gary/lazr.batchnavigator/fixbuild
Reviewer Review Type Date Requested Status
LAZR Developers Pending
Review via email: mp+10882@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 lacr-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 :

> 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 lacr-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).

Reviewed, merged, and released. (Not registered due to PyPI problem.)

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 15:07:42 +0000
3+++ MANIFEST.in 2009-08-29 16:39:43 +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-03-23 16:14:28 +0000
12+++ setup.py 2009-08-29 16:39:43 +0000
13@@ -36,8 +36,7 @@
14 return '\n'.join(res)
15 # end generic helpers
16
17-sys.path.insert(0, 'src')
18-from lazr.batchnavigator import __version__
19+__version__ = open("src/lazr/batchnavigator/version.txt").read().strip()
20
21 setup(
22 name='lazr.batchnavigator',
23@@ -72,6 +71,5 @@
24 docs=['Sphinx',
25 'z3c.recipe.sphinxdoc']
26 ),
27- setup_requires=['eggtestinfo', 'setuptools_bzr'],
28 test_suite='lazr.yourpkg.tests',
29 )
30
31=== modified file 'src/lazr/batchnavigator/NEWS.txt'
32--- src/lazr/batchnavigator/NEWS.txt 2009-03-24 15:57:40 +0000
33+++ src/lazr/batchnavigator/NEWS.txt 2009-08-29 17:55:28 +0000
34@@ -2,6 +2,13 @@
35 NEWS for lazr.batchnavigator
36 ============================
37
38+1.1 (unreleased)
39+================
40+
41+- Remove build dependencies on bzr and egg_info
42+
43+- remove sys.path hack in setup.py for __version__
44+
45 1.0 (2009-03-24)
46 ================
47
48
49=== modified file 'src/lazr/batchnavigator/__init__.py'
50--- src/lazr/batchnavigator/__init__.py 2009-03-23 16:14:28 +0000
51+++ src/lazr/batchnavigator/__init__.py 2009-08-29 16:39:43 +0000
52@@ -16,15 +16,12 @@
53
54 """Functions for working with generic syntax URIs."""
55
56-__version__ = 1.0
57+import pkg_resources
58+__version__ = pkg_resources.resource_string(
59+ "lazr.batchnavigator", "version.txt").strip()
60
61-# Re-export in such a way that __version__ can still be imported if
62-# dependencies are not yet available.
63-try:
64- # While we generally frown on "*" imports, this, combined with the fact we
65- # only test code from this module, means that we can verify what has been
66- # exported.
67- from lazr.batchnavigator._batchnavigator import *
68- from lazr.batchnavigator._batchnavigator import __all__
69-except ImportError:
70- pass
71+# While we generally frown on "*" imports, this, combined with the fact we
72+# only test code from this module, means that we can verify what has been
73+# exported.
74+from lazr.batchnavigator._batchnavigator import *
75+from lazr.batchnavigator._batchnavigator import __all__
76
77=== added file 'src/lazr/batchnavigator/version.txt'
78--- src/lazr/batchnavigator/version.txt 1970-01-01 00:00:00 +0000
79+++ src/lazr/batchnavigator/version.txt 2009-08-29 17:55:28 +0000
80@@ -0,0 +1,1 @@
81+1.1

Subscribers

People subscribed via source and target branches