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

Proposed by Gary Poster
Status: Merged
Merge reported by: Robert Collins
Merged at revision: not available
Proposed branch: lp:~gary/lazr.delegates/fixbuild
Merge into: lp:~launchpad-pqm/lazr.delegates/devel
Diff against target: None lines
To merge this branch: bzr merge lp:~gary/lazr.delegates/fixbuild
Reviewer Review Type Date Requested Status
Leonard Richardson (community) Approve
Review via email: mp+10884@code.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 :

> 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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
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 19:51:29 +0000
+++ setup.py 2009-08-29 17:51:36 +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/delegates/version.txt").read().strip()
40sys.path.insert(0, 'src')
41from lazr.delegates import __version__
4240
43setup(41setup(
44 name='lazr.delegates',42 name='lazr.delegates',
@@ -53,7 +51,7 @@
53 description=open('README.txt').readline().strip(),51 description=open('README.txt').readline().strip(),
54 long_description=generate(52 long_description=generate(
55 'src/lazr/delegates/README.txt',53 'src/lazr/delegates/README.txt',
56 'src/lazr/delegates/CHANGES.txt'),54 'src/lazr/delegates/NEWS.txt'),
57 license='LGPL v3',55 license='LGPL v3',
58 install_requires=[56 install_requires=[
59 'setuptools',57 'setuptools',
@@ -71,6 +69,5 @@
71 docs=['Sphinx',69 docs=['Sphinx',
72 'z3c.recipe.sphinxdoc']70 'z3c.recipe.sphinxdoc']
73 ),71 ),
74 setup_requires=['eggtestinfo', 'setuptools_bzr'],
75 test_suite='lazr.delegates.tests',72 test_suite='lazr.delegates.tests',
76 )73 )
7774
=== 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 @@
1=======1=======================
2Changes2NEWS for lazr.delegates
3=======3=======================
4
51.1.0 (unreleased)
6==================
7
8- Remove build dependencies on bzr and egg_info
9
10- remove sys.path hack in setup.py for __version__
411
51.0.1 (2009-03-24)121.0.1 (2009-03-24)
6==================13==================
714
=== 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 @@
1616
17"""Decorator helpers that simplify class composition."""17"""Decorator helpers that simplify class composition."""
1818
19__version__ = '1.0.1'19import pkg_resources
20__version__ = pkg_resources.resource_string(
21 "lazr.delegates", "version.txt").strip()
2022
21# Re-export in such a way that __version__ can still be imported if23# While we generally frown on "*" imports, this, combined with the fact we
22# dependencies are not yet available.24# only test code from this module, means that we can verify what has been
23try:25# exported.
24 # While we generally frown on "*" imports, this, combined with the fact we26from lazr.delegates._delegates import *
25 # only test code from this module, means that we can verify what has been27from lazr.delegates._delegates import __all__
26 # exported.
27 from lazr.delegates._delegates import *
28 from lazr.delegates._delegates import __all__
29except ImportError:
30 pass
3128
=== 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 @@
11.1.0

Subscribers

People subscribed via source and target branches