Split requirements.txt for tests

.travis.yml

@@ -13,6 +13,7 @@ before_install:
 install:
   - if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install --use-mirrors unittest2; fi
   - pip install -r requirements.txt
+  - pip install -r test-requirements.txt
 
 script: ./build.sh
 

README.md

@@ -20,11 +20,22 @@ Install `osmapi` simply by using pip:
 If you want to help with the development of `osmapi`, you should clone this repository and install the requirements:
 
     pip install -r requirements.txt
+    pip install -r test-requirements.txt
 
 After that, it is recommended to install the `flake8` pre-commit-hook:
 
     flake8 --install-hook
 
+### Tests
+
+To run the tests use the following command:
+
+    nosetests --verbose
+
+By using tox you can even run the tests against different versions of python (2.6, 2.7, 3.2 and 3.3):
+
+    tox
+
 ## Note
 
 Scripted imports and automated edits should only be carried out by those with experience and understanding of the way the OpenStreetMap community creates maps, and only with careful **planning** and **consultation** with the local community.

requirements.txt

@@ -1,8 +1,4 @@
 # This file lists the dependencies of this extension.
 # Install with a command like: pip install -r pip-requirements.txt
-flake8==2.1.0
-coveralls==0.4.1
-mock==1.0.1
 pypandoc==0.7.0
 Unidecode==0.04.14
-xmltodict==0.9.0

setup.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
 import codecs
 
 version = __import__('osmapi').__version__

test-requirements.txt

@@ -0,0 +1,8 @@
+# This file lists the dependencies of this extension.
+# Install with a command like: pip install -r pip-requirements.txt
+flake8==2.1.0
+nose==1.3.0
+tox==1.7.1
+coveralls==0.4.1
+mock==1.0.1
+xmltodict==0.9.0

tox.ini

@@ -1,11 +1,10 @@
 [tox]
-envlist = py26,py27,py33
+envlist = py26,py27,py32,py33
 [testenv]
 commands=nosetests --verbose
 deps =
-    nose
-    mock
-    Unidecode
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/test-requirements.txt
 [testenv:py26]
 deps =
     unittest2