Merge lp:~gary/lazr.delegates/fixbuild into lp:~launchpad-pqm/lazr.delegates/devel

[Gary Poster]

[Gary Poster (gary)]

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

[Leonard Richardson (leonardr)]

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

Approved, merged, and released.

review: Approve

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2009-03-24 18:52:52 +0000
+++ MANIFEST.in	2009-08-29 17:51:36 +0000
@@ -1,2 +1,4 @@
+include ez_setup.py
+recursive-include src *.txt *.pt *.zcml *.xsd
 exclude MANIFEST.in buildout.cfg bootstrap.py .bzrignore
 prune _bootstrap

=== modified file 'setup.py'
--- setup.py	2009-03-24 19:51:29 +0000
+++ setup.py	2009-08-29 17:51:36 +0000
@@ -36,9 +36,7 @@
     return '\n'.join(res)
 # end generic helpers
 
-
-sys.path.insert(0, 'src')
-from lazr.delegates import __version__
+__version__ = open("src/lazr/delegates/version.txt").read().strip()
 
 setup(
     name='lazr.delegates',
@@ -53,7 +51,7 @@
     description=open('README.txt').readline().strip(),
     long_description=generate(
         'src/lazr/delegates/README.txt',
-        'src/lazr/delegates/CHANGES.txt'),
+        'src/lazr/delegates/NEWS.txt'),
     license='LGPL v3',
     install_requires=[
         'setuptools',
@@ -71,6 +69,5 @@
         docs=['Sphinx',
               'z3c.recipe.sphinxdoc']
     ),
-    setup_requires=['eggtestinfo', 'setuptools_bzr'],
     test_suite='lazr.delegates.tests',
     )

=== renamed file 'src/lazr/delegates/CHANGES.txt' => 'src/lazr/delegates/NEWS.txt'
--- src/lazr/delegates/CHANGES.txt	2009-03-24 19:51:29 +0000
+++ src/lazr/delegates/NEWS.txt	2009-08-29 17:51:36 +0000
@@ -1,6 +1,13 @@
-=======
-Changes
-=======
+=======================
+NEWS for lazr.delegates
+=======================
+
+1.1.0 (unreleased)
+==================
+
+- Remove build dependencies on bzr and egg_info
+
+- remove sys.path hack in setup.py for __version__
 
 1.0.1 (2009-03-24)
 ==================

=== modified file 'src/lazr/delegates/__init__.py'
--- src/lazr/delegates/__init__.py	2009-03-24 20:27:31 +0000
+++ src/lazr/delegates/__init__.py	2009-08-29 17:51:36 +0000
@@ -16,15 +16,12 @@
 
 """Decorator helpers that simplify class composition."""
 
-__version__ = '1.0.1'
+import pkg_resources
+__version__ = pkg_resources.resource_string(
+    "lazr.delegates", "version.txt").strip()
 
-# Re-export in such a way that __version__ can still be imported if
-# dependencies are not yet available.
-try:
-    # While we generally frown on "*" imports, this, combined with the fact we
-    # only test code from this module, means that we can verify what has been
-    # exported.
-    from lazr.delegates._delegates import *
-    from lazr.delegates._delegates import __all__
-except ImportError:
-    pass
+# While we generally frown on "*" imports, this, combined with the fact we
+# only test code from this module, means that we can verify what has been
+# exported.
+from lazr.delegates._delegates import *
+from lazr.delegates._delegates import __all__

=== added file 'src/lazr/delegates/version.txt'
--- src/lazr/delegates/version.txt	1970-01-01 00:00:00 +0000
+++ src/lazr/delegates/version.txt	2009-08-29 17:51:36 +0000
@@ -0,0 +1,1 @@
+1.1.0