Merge pull request #17 from metaodi/develop

Release 0.3.0

.gitignore

@@ -2,3 +2,4 @@ dist/
 MANIFEST
 *.pyc
 .coverage
+.tox

.travis.yml

@@ -1,14 +1,19 @@
 language: python
 
 python:
-- '2.6'
-- '2.7'
+  - '2.6'
+  - '2.7'
+  - '3.2'
+  - '3.3'
 
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq pandoc
 
-install: pip install -r requirements.txt
+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.