txFluidDB

Merge lp:~txfluiddb-maint/txfluiddb/release-0.1.0 into lp:txfluiddb

  1. release-0.1.0
  2. Merge into trunk
Proposed by Tristan Seligmann
Status: Merged
Approved by: Tristan Seligmann
Approved revision: 15
Merged at revision: 14
Proposed branch: lp:~txfluiddb-maint/txfluiddb/release-0.1.0
Merge into: lp:txfluiddb
Diff against target: 27 lines (+6/-1)
3 files modified
setup.py (+1/-1)
txfluiddb/__init__.py (+2/-0)
txfluiddb/_version.py (+3/-0)
To merge this branch: bzr merge lp:~txfluiddb-maint/txfluiddb/release-0.1.0
Reviewer Review Type Date Requested Status
Jonathan Jacobs (community) Approve
txFluidDB maintainers Pending
Review via email: mp+35525@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jonathan Jacobs (jjacobs) :
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 2010-08-12 18:06:47 +0000
3+++ setup.py 2010-09-15 12:23:40 +0000
4@@ -5,7 +5,7 @@
5
6 setup(
7 name = 'txfluiddb',
8- version = '0.1',
9+ version = '0.1.0',
10 packages = ['txfluiddb'],
11 author = 'Tristan Seligmann',
12 )
13
14=== modified file 'txfluiddb/__init__.py'
15--- txfluiddb/__init__.py 2009-08-17 23:22:02 +0000
16+++ txfluiddb/__init__.py 2010-09-15 12:23:40 +0000
17@@ -0,0 +1,2 @@
18+from txfluiddb._version import version
19+__all__ = ['version']
20
21=== added file 'txfluiddb/_version.py'
22--- txfluiddb/_version.py 1970-01-01 00:00:00 +0000
23+++ txfluiddb/_version.py 2010-09-15 12:23:40 +0000
24@@ -0,0 +1,3 @@
25+# This is an auto-generated file. Do not edit it.
26+from twisted.python import versions
27+version = versions.Version('txfluiddb', 0, 1, 0)

Subscribers

People subscribed via source and target branches