RiakAlchemy

Merge lp:~soren/riakalchemy/allow-pip-install into lp:riakalchemy

  1. allow-pip-install
  2. Merge into trunk
Proposed by Soren Hansen
Status: Merged
Approved by: Soren Hansen
Approved revision: 18
Merged at revision: 18
Proposed branch: lp:~soren/riakalchemy/allow-pip-install
Merge into: lp:riakalchemy
Diff against target: 26 lines (+1/-4)
2 files modified
riakalchemy/__init__.py (+0/-2)
setup.py (+1/-2)
To merge this branch: bzr merge lp:~soren/riakalchemy/allow-pip-install
Reviewer Review Type Date Requested Status
Soren Hansen Pending
Review via email: mp+84023@code.launchpad.net

Commit message

Move version back into setup.py to allow setup.py to run when riak is not installed yet.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'riakalchemy/__init__.py'
2--- riakalchemy/__init__.py 2011-11-25 22:35:05 +0000
3+++ riakalchemy/__init__.py 2011-11-30 21:46:27 +0000
4@@ -1,5 +1,3 @@
5-__version__ = '0.1a4'
6-
7 import model
8 from model import NoSuchObjectError
9
10
11=== modified file 'setup.py'
12--- setup.py 2011-11-25 22:35:05 +0000
13+++ setup.py 2011-11-30 21:46:27 +0000
14@@ -1,11 +1,10 @@
15 #!/usr/bin/python
16
17-import riakalchemy
18 from setuptools import setup
19
20 setup(
21 name='riakalchemy',
22- version=riakalchemy.__version__,
23+ version='0.1a4',
24 description='Object Mapper for Riak',
25 author='Soren Hansen',
26 license='LGPL',

Subscribers

People subscribed via source and target branches

to all changes: