Skip to content

Commit 34531b6

Browse files
committed
Updated to use a venv setup. Removed nosetests3 from the Makefile.
1 parent 14455cf commit 34531b6

File tree

7 files changed

+26
-9
lines changed

7 files changed

+26
-9
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ qless_py.egg-info/*
88
.vagrant
99
MANIFEST
1010
.tox/
11+
venv/
12+
*.sublime-project
13+
*.sublime-workspace

Makefile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,10 @@ qless-core:
1616

1717
.PHONY: nose
1818
nose: qless-core
19-
rm -rf .coverage
20-
nosetests --exe --cover-package=qless --with-coverage --cover-branches -v
21-
22-
.PHONY: nose3
23-
nose3: qless-core
24-
rm -rf .coverage
25-
nosetests3 --exe --cover-package=qless --with-coverage --cover-branches -v
19+
nosetests --with-coverage
2620

2721
requirements:
2822
pip freeze | grep -v -e qless-py > requirements.txt
2923

3024
.PHONY: test
31-
test: nose nose3
25+
test: nose

provision.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,14 @@ pushd /vagrant
3232
pyenv install
3333
pyenv rehash
3434

35-
# Install our requirements
35+
# Install a virtualenv
36+
pip install virtualenv
37+
if [ ! -d venv ]; then
38+
virtualenv venv
39+
fi
40+
source venv/bin/activate
41+
42+
# Lastly, our dependencies
3643
pip install -r requirements.txt
44+
3745
popd

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ mock==1.3.0
88
nose==1.3.7
99
pbr==1.8.1
1010
redis==2.7.5
11+
rednose==1.1.1
1112
setproctitle==1.1.5
1213
simplejson==3.3.0
1314
six==1.10.0

setup.cfg

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[nosetests]
2+
verbosity=2
3+
rednose=1
4+
exe=1
5+
cover-package=qless
6+
cover-branches=1
7+
cover-min-percentage=98
8+
cover-erase=1
9+
logging-clear-handlers=1

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
'coverage',
4949
'mock',
5050
'nose',
51+
'rednose',
5152
'setuptools>=17.1'
5253
],
5354
classifiers = [

tox.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ envlist = py27,py33,py34,py35
44
[testenv]
55
deps =
66
nose
7+
rednose
78
mock
89
gevent
910
setproctitle

0 commit comments

Comments
 (0)