Merge remote-tracking branch 'origin/develop'

Conflicts: MANIFEST.in setup.py
jazzband · Jan 23, 2013 · ebcbca0 · ebcbca0
2 parents 17690a4 + d17299a
commit ebcbca0
Show file tree

Hide file tree

Showing 23 changed files with 1,438 additions and 759 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,3 @@
 language: python
-python:
-  - "2.5"
-  - "2.6"
-  - "2.7"
-  - "3.1"
-  - "3.2"
-  - "pypy"
-# command to install dependencies
-install: pip install pytest --use-mirrors
-# command to run tests
-script: py.test
+install: pip install tox --use-mirrors
+script: tox
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,2 @@
-include README.md LICENSE-MIT
+include README.rst LICENSE-MIT
 recursive-include examples *.py
diff --git a/README.md b/README.md