lazr.smtptest

Merge lp://staging/~gary/lazr.smtptest/fixversion into lp://staging/lazr.smtptest

  1. fixversion
  2. Merge into devel
Proposed by Gary Poster
Status: Merged
Approved by: Barry Warsaw
Approved revision: 62
Merged at revision: not available
Proposed branch: lp://staging/~gary/lazr.smtptest/fixversion
Merge into: lp://staging/lazr.smtptest
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~gary/lazr.smtptest/fixversion
Reviewer Review Type Date Requested Status
Barry Warsaw Approve
Review via email: mp+11223@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Gary Poster (gary) wrote :

This changes the approach for defining the version. Debian packages have issues with this approach (see bug 400170) and it caused an issue with our buildout branch as well (though I squashed that one). We're moving all of our packages to this version.txt approach.

Revision history for this message
Barry Warsaw (barry) wrote :

On Sep 04, 2009, at 07:15 PM, Gary Poster wrote:

>Gary Poster has proposed merging lp:~gary/lazr.smtptest/fixversion into lp:lazr.smtptest.
>
>Requested reviews:
> Barry Warsaw (barry)
>
>This changes the approach for defining the version. Debian packages have issues with this approach (see bug 400170) and it caused an issue with our buildout branch as well (though I squashed that one). We're moving all of our packages to this version.txt approach.

 review approve
 status approve

review: Approve

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-06-22 22:40:16 +0000
3+++ setup.py 2009-09-04 19:06:38 +0000
4@@ -36,9 +36,7 @@
5 return '\n'.join(res)
6 # end generic helpers
7
8-
9-sys.path.insert(0, 'src')
10-from lazr.smtptest import __version__
11+__version__ = open("src/lazr/smtptest/version.txt").read().strip()
12
13 setup(
14 name='lazr.smtptest',
15
16=== modified file 'src/lazr/smtptest/__init__.py'
17--- src/lazr/smtptest/__init__.py 2009-06-30 00:40:38 +0000
18+++ src/lazr/smtptest/__init__.py 2009-09-04 19:06:38 +0000
19@@ -16,5 +16,6 @@
20
21 "The lazr.smtptest package."
22
23-
24-__version__ = '1.2'
25+import pkg_resources
26+__version__ = pkg_resources.resource_string(
27+ "lazr.smtptest", "version.txt").strip()
28
29=== added file 'src/lazr/smtptest/version.txt'
30--- src/lazr/smtptest/version.txt 1970-01-01 00:00:00 +0000
31+++ src/lazr/smtptest/version.txt 2009-09-04 19:06:38 +0000
32@@ -0,0 +1,1 @@
33+1.2

Subscribers

People subscribed via source and target branches

to all changes: