Metadata change

.travis-devel-requirements.txt

@@ -1,6 +0,0 @@
-git+git://github.com/mitsuhiko/werkzeug.git#egg=Werkzeug
-git+git://github.com/mitsuhiko/jinja2.git#egg=Jinja2
-git+git://github.com/mitsuhiko/itsdangerous.git#egg=itsdangerous
-
-# extra dependencies
-git+git://github.com/jek/blinker.git#egg=blinker

.travis-lowest-requirements.txt

@@ -1,6 +0,0 @@
-Werkzeug==0.7
-Jinja2==2.4
-itsdangerous==0.21
-
-# extra dependencies
-blinker==1.0

.travis-release-requirements.txt

@@ -1,2 +0,0 @@
-# extra dependencies
-blinker

.travis.yml

@@ -5,6 +5,7 @@ python:
   - "2.7"
   - "pypy"
   - "3.3"
+  - "3.4"
 
 env:
   - REQUIREMENTS=lowest
@@ -18,10 +19,11 @@ matrix:
       env: REQUIREMENTS=lowest
 
 install:
-  - pip install -r .travis-$REQUIREMENTS-requirements.txt
+    - pip install hg+https://bitbucket.org/hpk42/tox
-  - pip install --editable .
 
-script: make test
+script:
+    - tox -e \
+      $(echo py$TRAVIS_PYTHON_VERSION | tr -d . | sed -e 's/pypypy/pypy/')-$REQUIREMENTS
 
 branches:
   except:

Makefile

@@ -3,7 +3,7 @@
 all: clean-pyc test
 
 test:
-	python run-tests.py
+	py.test
 
 tox-test:
 	tox

setup.cfg

@@ -1,6 +1,3 @@
-[pytest]
-norecursedirs= scripts docs
-
 [aliases]
 release = egg_info -RDb ''
 

tox.ini

@@ -1,12 +1,27 @@
 [tox]
-envlist = docs, py26, py27, pypy, py33, py34
+envlist =
+    docs
+    {py26,py27,pypy,py33,py34}-{lowest,release,devel}
 
 [testenv]
-deps=
+commands =
-    blinker
+    py.test []
-    pytest
-commands = py.test []
 
+deps=
+    pytest
+
+    lowest: Werkzeug==0.7
+    lowest: Jinja==2.4
+    lowest: itsdangerous==0.21
+    lowest: blinker==1.0
+    release: blinker
+    devel: git+git://github.com/mitsuhiko/werkzeug.git
+    devel: git+git://github.com/mitsuhiko/jinja2.git
+    devel: git+git://github.com/mitsuhiko/itsdangerous.git
+    devel: git+git://github.com/jek/blinker.git
+
+# extra dependencies
+git+git://github.com/jek/blinker.git#egg=blinker
 
 [testenv:docs]
 deps = sphinx