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

[Leonard Richardson]

[Leonard Richardson (leonardr)]

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

[lp:~leonardr/lazr.config/fix-version]

5. By Leonard Richardson on 2009-08-25

Removed unneeded setuptools_bzr code.

[Deryck Hodge (deryck)]

Looks good, Leonard.

Cheers,
deryck

review: Approve (code)

[lp:~leonardr/lazr.config/fix-version]

6. By Leonard Richardson on 2009-08-25

Fixed build problem.

=== modified file 'setup.py'
--- setup.py	2009-03-24 17:31:47 +0000
+++ setup.py	2009-08-25 13:46:10 +0000
@@ -37,8 +37,7 @@
 # end generic helpers
 
 
-sys.path.insert(0, 'src')
-from lazr.config import __version__
+__version__ = open("src/lazr/config/version.txt").read().strip()
 
 setup(
     name='lazr.config',

=== added file 'src/lazr/config/NEWS.txt'
--- src/lazr/config/NEWS.txt	1970-01-01 00:00:00 +0000
+++ src/lazr/config/NEWS.txt	2009-08-25 13:46:10 +0000
@@ -0,0 +1,10 @@
+1.1.2 (2009-08-25)
+==================
+
+Got rid of a sys.path hack.
+
+
+1.1.1
+=====
+
+Initial release

=== modified file 'src/lazr/config/__init__.py'
--- src/lazr/config/__init__.py	2009-03-24 17:31:47 +0000
+++ src/lazr/config/__init__.py	2009-08-25 13:46:10 +0000
@@ -16,7 +16,8 @@
 
 """A configuration file system."""
 
-__version__ = '1.1.1'
+import pkg_resources
+__version__ = pkg_resources.resource_string("lazr.config", "version.txt").strip()
 
 # Re-export in such a way that __version__ can still be imported if
 # dependencies are not yet available.

=== added file 'src/lazr/config/version.txt'
--- src/lazr/config/version.txt	1970-01-01 00:00:00 +0000
+++ src/lazr/config/version.txt	2009-08-25 13:46:10 +0000
@@ -0,0 +1,1 @@
+1.1.2