From 34b19f39a80e9fbd715e33b4f992607b390fee08 Mon Sep 17 00:00:00 2001
From: kgriffs <kurt.griffiths@rackspace.com>
Date: Thu, 27 Mar 2014 10:30:15 -0500
Subject: [PATCH] test(tox): Ensure Falcon works with Python 3.4

It appears to work with now changes! All tests green.

Closes #244
---
 .travis.yml |  2 ++
 setup.py    |  1 +
 tox.ini     | 25 +++++++++++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 7a6e839..daac765 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,8 @@ env:
   - TOX_ENV=py27_cython
   - TOX_ENV=py33
   - TOX_ENV=py33_cython
+  - TOX_ENV=py34
+  - TOX_ENV=py34_cython
   - TOX_ENV=pypy
   - TOX_ENV=pep8
   - TOX_ENV=pylint
diff --git a/setup.py b/setup.py
index 9939cdf..9a5fec9 100644
--- a/setup.py
+++ b/setup.py
@@ -74,6 +74,7 @@ setup(
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
     ],
     keywords='wsgi web api framework rest http cloud',
     author='Kurt Griffiths',
diff --git a/tox.ini b/tox.ini
index 0bc6399..2c7b738 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,6 +4,8 @@ envlist = py26,
           py27_cython,
           py33,
           py33_cython,
+          py34,
+          py34_cython,
           pypy,
           pep8,
           pylint,
@@ -14,6 +16,8 @@ envlist = py26,
           py27_bench_cython,
           py33_bench,
           py33_bench_cython,
+          py34_bench,
+          py34_bench_cython,
           pypy_bench
 
 [testenv]
@@ -47,6 +51,14 @@ commands = {toxinidir}/tools/clean_cythoned.sh {toxinidir}/falcon
            nosetests \
                {posargs}
 
+[testenv:py34_cython]
+deps = -r{toxinidir}/tools/test-requires
+       cython
+basepython = python3.4
+commands = {toxinidir}/tools/clean_cythoned.sh {toxinidir}/falcon
+           nosetests \
+               {posargs}
+
 [testenv:py3kwarn]
 deps = py3kwarn
 commands = py3kwarn falcon
@@ -93,6 +105,19 @@ deps = -r{toxinidir}/tools/bench-requires
 basepython = python3.3
 commands = falcon-bench {posargs}
 
+[testenv:py34_bench]
+deps = -r{toxinidir}/tools/bench-requires
+basepython = python3.4
+
+# NOTE(kgriffs): Hard-code test since other frameworks don't work on 3.4
+commands = falcon-bench -b falcon -b falcon-ext -b pecan -b bottle {posargs}
+
+[testenv:py34_bench_cython]
+deps = -r{toxinidir}/tools/bench-requires
+       cython
+basepython = python3.4
+commands = falcon-bench -b falcon -b falcon-ext -b pecan -b bottle {posargs}
+
 [testenv:pypy_bench]
 deps = -r{toxinidir}/tools/bench-requires
 basepython = pypy