Merge pull request #6 from ryanhiebert/tox-fix

Decode the README as utf-8

.travis.yml

@@ -1,33 +1,11 @@
+sudo: false
 language: python
-
-python:
-  - "2.6"
-  - "2.7"
-  - "3.2"
-  - "3.3"
-  - "3.4"
-  - "pypy"
-
+install: pip install tox
 env:
-  - PIP_USE_MIRRORS=true DEPS="genshi"
-  - PIP_USE_MIRRORS=true DEPS="kid genshi"
-
-matrix:
-  exclude:
-    - python: "2.6"
-      env: PIP_USE_MIRRORS=true DEPS="genshi"
-    - python: "2.7"
-      env: PIP_USE_MIRRORS=true DEPS="genshi"
-    - python: "pypy"
-      env: PIP_USE_MIRRORS=true DEPS="genshi"
-    - python: "3.2"
-      env: PIP_USE_MIRRORS=true DEPS="kid genshi"
-    - python: "3.3"
-      env: PIP_USE_MIRRORS=true DEPS="kid genshi"
-    - python: "3.4"
-      env: PIP_USE_MIRRORS=true DEPS="kid genshi"
-
-install:
-  - "pip install $DEPS"
-
-script: "python setup.py test"
+  - TOXENV=py26
+  - TOXENV=py27
+  - TOXENV=py32
+  - TOXENV=py33
+  - TOXENV=py34
+  - TOXENV=pypy
+script: tox

setup.py

@@ -49,7 +49,7 @@ def run_tests(self):
       version='0.6.0',
       description=
       'A really simple WSGI way to serve static (or mixed) content.',
-      long_description=open('README.rst').read(),
+      long_description=open('README.rst', 'rb').read().decode('utf-8'),
       author='Roman Mohr',
       author_email='[email protected]',
       url='https://github.com/rmohr/static3',

tox.ini

@@ -1,17 +1,16 @@
 [tox]
-envlist = py27, py33
+envlist = py26, py27, py32, py33, py34, pypy
 
 [testenv]
-deps=distribute
+deps=
+    distribute
+    pytest
+    genshi
+    py{26,27},pypy: kid
 commands=python setup.py test []
 sitepackages=False
-
-[testenv:py27]
-deps=kid
-     genshi
-
-[testenv:py33]
-deps=genshi
+setenv=
+    PIP_USE_MIRRORS=true
 
 [pytest]
 norecursedirs = bin eggs .git _build tmp* lib *.egg