summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Marshall <catchjosh@gmail.com>2015-10-20 00:20:22 -0500
committerJosh Marshall <catchjosh@gmail.com>2015-10-20 00:20:22 -0500
commit394d5861366250cb43ab361fc79900df807f4cdb (patch)
treec79839102a1be57de28f69dfdd06968b8efca3a1
parent36d09677e493f9c3dc1c1130663ad874ab20bfc7 (diff)
parentbcf8f78e9204cb1488ff8d0fa377337a06ef709f (diff)
downloadjsonrpclib-394d5861366250cb43ab361fc79900df807f4cdb.tar.gz
Merge pull request #43 from efokschaner/use-tox-tests
Use tox tests to catch distribution issues
-rw-r--r--.travis.yml3
-rw-r--r--dev-requirements.txt5
-rw-r--r--tox.ini5
3 files changed, 11 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index c26fcd2..fe1cd05 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,11 +2,10 @@ language: python
sudo: false
python:
- '2.7'
-- '2.6'
install:
- pip install -r dev-requirements.txt
- pip install twine
-script: nosetests tests.py --with-coverage --cover-package=jsonrpclib
+script: tox
deploy:
provider: pypi
user: joshmarshall
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 33be765..95cb849 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,6 +1,11 @@
coverage==4.0
linecache2==1.0.0
nose==1.3.7
+pluggy==0.3.1
+py==1.4.30
six==1.9.0
+tox==2.1.1
traceback2==1.4.0
unittest2==1.1.0
+virtualenv==13.1.2
+wheel==0.24.0
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..36d7f18
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,5 @@
+[tox]
+envlist = py26,py27
+[testenv]
+deps= -rdev-requirements.txt
+commands=nosetests tests.py --with-coverage --cover-package=jsonrpclib