Merge lp:~soren/riakalchemy/virtualenv into lp:riakalchemy

Proposed by Soren Hansen
Status: Merged
Approved by: Soren Hansen
Approved revision: 24
Merged at revision: 24
Proposed branch: lp:~soren/riakalchemy/virtualenv
Merge into: lp:riakalchemy
Diff against target: 66 lines (+37/-0)
4 files modified
README.md (+19/-0)
tools/pip-requirements.txt (+5/-0)
tools/setup_virtualenv.sh (+8/-0)
tools/venv_wrap.sh (+5/-0)
To merge this branch: bzr merge lp:~soren/riakalchemy/virtualenv
Reviewer Review Type Date Requested Status
Soren Hansen Pending
Review via email: mp+85615@code.launchpad.net

Commit message

Provide a pip-requirements file and tools to easily create a virtualenv

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
=== modified file 'README.md'
--- README.md 2011-12-08 16:06:06 +0000
+++ README.md 2011-12-14 09:13:46 +0000
@@ -216,9 +216,28 @@
216216
217> {delete_mode, immediate}217> {delete_mode, immediate}
218218
219### Scripted configuration ###
220
221You can make all these config changes with this single command assuming
222your existing `app.config` is unmodified from when you installed Riak.
223
224> sudo sed -e '/^ {riak_kv/ a {delete_mode, immediate},' \
225> -e 's/storage_backend, riak_kv_bitcask_backend/storage_backend, riak_kv_eleveldb_backend/' \
226> -e '/^ {riak_search/,+2 s/enabled, false/enabled, true/' -i.bak /etc/riak/app.config
227
219## Running the tests ##228## Running the tests ##
220229
221At the moment, python-riak's TestServer doesn't support 2I, so we need230At the moment, python-riak's TestServer doesn't support 2I, so we need
222access to a real Riak. To run the tests against a real Riak, use:231access to a real Riak. To run the tests against a real Riak, use:
223232
224> $ RIAKALCHEMY_SYSTEM_RIAK_PORT=8098 nosetests .233> $ RIAKALCHEMY_SYSTEM_RIAK_PORT=8098 nosetests .
234
235### Virtualenv ###
236
237The `tools/` directory has a script to easily create a virtualenv for you:
238
239> $ tools/setup_virtualenv.sh
240
241Once it's done, you can run the unit tests in the virtualenv like so:
242
243> $ RIAKALCHEMY_SYSTEM_RIAK_PORT=8098 .tools/venv_wrap.sh nosetests
225244
=== added directory 'tools'
=== added file 'tools/pip-requirements.txt'
--- tools/pip-requirements.txt 1970-01-01 00:00:00 +0000
+++ tools/pip-requirements.txt 2011-12-14 09:13:46 +0000
@@ -0,0 +1,5 @@
1-e git://github.com/basho/riak-python-client.git@master#egg=riak
2nose
3yanc
4nosexcover
5unittest2
06
=== added file 'tools/setup_virtualenv.sh'
--- tools/setup_virtualenv.sh 1970-01-01 00:00:00 +0000
+++ tools/setup_virtualenv.sh 2011-12-14 09:13:46 +0000
@@ -0,0 +1,8 @@
1#!/bin/bash
2
3topdir=$(dirname $0)/../
4cd $topdir
5
6rm -rf .venv
7virtualenv --no-site-packages .venv
8.venv/bin/pip install -r tools/pip-requirements.txt
09
=== added file 'tools/venv_wrap.sh'
--- tools/venv_wrap.sh 1970-01-01 00:00:00 +0000
+++ tools/venv_wrap.sh 2011-12-14 09:13:46 +0000
@@ -0,0 +1,5 @@
1#!/bin/bash
2topdir=$(dirname $0)/..
3cd $topdir
4source .venv/bin/activate
5exec "$@"

Subscribers

People subscribed via source and target branches

to all changes: