From 8d97d7143079dd862564a1e119ad44817ba176d6 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Mon, 1 Sep 2014 00:30:27 +0200
Subject: [PATCH] Metadata change

---
 .travis-devel-requirements.txt                |  6 ------
 .travis-lowest-requirements.txt               |  6 ------
 .travis-release-requirements.txt              |  2 --
 .travis.yml                                   |  8 ++++---
 Makefile                                      |  2 +-
 .../{flaskext_test.py => flaskext_tester.py}  |  0
 setup.cfg                                     |  3 ---
 tox.ini                                       | 21 ++++++++++++++++---
 8 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 .travis-devel-requirements.txt
 delete mode 100644 .travis-lowest-requirements.txt
 delete mode 100644 .travis-release-requirements.txt
 rename scripts/{flaskext_test.py => flaskext_tester.py} (100%)

diff --git a/.travis-devel-requirements.txt b/.travis-devel-requirements.txt
deleted file mode 100644
index 18ee00ec..00000000
--- a/.travis-devel-requirements.txt
+++ /dev/null
@@ -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
diff --git a/.travis-lowest-requirements.txt b/.travis-lowest-requirements.txt
deleted file mode 100644
index 5066d698..00000000
--- a/.travis-lowest-requirements.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Werkzeug==0.7
-Jinja2==2.4
-itsdangerous==0.21
-
-# extra dependencies
-blinker==1.0
diff --git a/.travis-release-requirements.txt b/.travis-release-requirements.txt
deleted file mode 100644
index f2f097cb..00000000
--- a/.travis-release-requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# extra dependencies
-blinker
diff --git a/.travis.yml b/.travis.yml
index 92f070c2..1fa286a6 100644
--- a/.travis.yml
+++ b/.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 --editable .
+    - pip install hg+https://bitbucket.org/hpk42/tox
 
-script: make test
+script:
+    - tox -e \
+      $(echo py$TRAVIS_PYTHON_VERSION | tr -d . | sed -e 's/pypypy/pypy/')-$REQUIREMENTS
 
 branches:
   except:
diff --git a/Makefile b/Makefile
index 98e74135..e1835e8c 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 all: clean-pyc test
 
 test:
-	python run-tests.py
+	py.test
 
 tox-test:
 	tox
diff --git a/scripts/flaskext_test.py b/scripts/flaskext_tester.py
similarity index 100%
rename from scripts/flaskext_test.py
rename to scripts/flaskext_tester.py
diff --git a/setup.cfg b/setup.cfg
index c3b4abda..dbd1f97a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,3 @@
-[pytest]
-norecursedirs= scripts docs
-
 [aliases]
 release = egg_info -RDb ''
 
diff --git a/tox.ini b/tox.ini
index 46792253..da76c277 100644
--- a/tox.ini
+++ b/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]
+commands =
+    py.test []
+
 deps=
-    blinker
     pytest
-commands = py.test []
 
+    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