lazr.config

Merge lp://staging/~leonardr/lazr.config/fix-version into lp://staging/~launchpad-pqm/lazr.config/devel

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

This branch removes the sys.path hack from lazr.config using the technique described in bug 400170.

lp://staging/~leonardr/lazr.config/fix-version updated
5. By Leonard Richardson

Removed unneeded setuptools_bzr code.

Revision history for this message
Deryck Hodge (deryck) wrote :

Looks good, Leonard.

Cheers,
deryck

review: Approve (code)
lp://staging/~leonardr/lazr.config/fix-version updated
6. By Leonard Richardson

Fixed build problem.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2009-03-24 17:31:47 +0000
3+++ setup.py 2009-08-25 13:46:10 +0000
4@@ -37,8 +37,7 @@
5 # end generic helpers
6
7
8-sys.path.insert(0, 'src')
9-from lazr.config import __version__
10+__version__ = open("src/lazr/config/version.txt").read().strip()
11
12 setup(
13 name='lazr.config',
14
15=== added file 'src/lazr/config/NEWS.txt'
16--- src/lazr/config/NEWS.txt 1970-01-01 00:00:00 +0000
17+++ src/lazr/config/NEWS.txt 2009-08-25 13:46:10 +0000
18@@ -0,0 +1,10 @@
19+1.1.2 (2009-08-25)
20+==================
21+
22+Got rid of a sys.path hack.
23+
24+
25+1.1.1
26+=====
27+
28+Initial release
29
30=== modified file 'src/lazr/config/__init__.py'
31--- src/lazr/config/__init__.py 2009-03-24 17:31:47 +0000
32+++ src/lazr/config/__init__.py 2009-08-25 13:46:10 +0000
33@@ -16,7 +16,8 @@
34
35 """A configuration file system."""
36
37-__version__ = '1.1.1'
38+import pkg_resources
39+__version__ = pkg_resources.resource_string("lazr.config", "version.txt").strip()
40
41 # Re-export in such a way that __version__ can still be imported if
42 # dependencies are not yet available.
43
44=== added file 'src/lazr/config/version.txt'
45--- src/lazr/config/version.txt 1970-01-01 00:00:00 +0000
46+++ src/lazr/config/version.txt 2009-08-25 13:46:10 +0000
47@@ -0,0 +1,1 @@
48+1.1.2

Subscribers

People subscribed via source and target branches