From daff6372c8a8f62184a4f909e4fa7442f49c8a7d Mon Sep 17 00:00:00 2001
From: Daniel Greenfeld <pydanny@gmail.com>
Date: Mon, 5 May 2014 08:08:48 -0700
Subject: [PATCH 1/2] Update Jinja2 requirement and add Python 3.4 to tests

---
 .travis.yml              | 2 ++
 requirements/test_34.txt | 3 +++
 setup.py                 | 2 +-
 tox.ini                  | 6 +++++-
 4 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 requirements/test_34.txt

diff --git a/.travis.yml b/.travis.yml
index 63efcfd..e478e0b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ python:
   - "2.7"
   - "2.6"
   - "pypy"
+  - "3.4"
 
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install:
@@ -14,6 +15,7 @@ install:
  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install -r requirements/test_27.txt; fi
  - if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then pip install -r requirements/test_27.txt; fi
  - if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then pip install -r requirements/test_33.txt; fi
+ - if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then pip install -r requirements/test_34.txt; fi
 
 # command to run tests, e.g. python setup.py test
 script: python setup.py test
diff --git a/requirements/test_34.txt b/requirements/test_34.txt
new file mode 100644
index 0000000..519e4c8
--- /dev/null
+++ b/requirements/test_34.txt
@@ -0,0 +1,3 @@
+# Requirements for testing Complexity on Python 3.4.
+
+-r base_test.txt
diff --git a/setup.py b/setup.py
index 56d5262..7fdf4a6 100755
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@
 history = history.replace(".. :changelog:", "")
 
 requirements = [
-    'jinja2==2.7',
+    'jinja2>=2.7',
     'binaryornot>=0.1.1',
     'PyYAML>=3.10'
 ]
diff --git a/tox.ini b/tox.ini
index ad8e53f..8f50426 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py33, pypy
+envlist = py26, py27, py33, py34, pypy
 
 [testenv:py26]
 deps = -r{toxinidir}/requirements/test_26.txt
@@ -12,3 +12,7 @@ commands = python setup.py test
 [testenv:py33]
 deps = -r{toxinidir}/requirements/test_33.txt
 commands = python setup.py test
+
+[testenv:py34]
+deps = -r{toxinidir}/requirements/test_34.txt
+commands = python setup.py test
\ No newline at end of file

From b7cc0f3472e4791b8fe48310d187a8f447413d16 Mon Sep 17 00:00:00 2001
From: Daniel Greenfeld <pydanny@gmail.com>
Date: Mon, 5 May 2014 08:09:55 -0700
Subject: [PATCH 2/2] This adds Jinja2 2.7 or higher, and Python 3.4 support

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 7fdf4a6..107524e 100755
--- a/setup.py
+++ b/setup.py
@@ -61,6 +61,7 @@
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
         'Topic :: Internet :: WWW/HTTP :: Site Management',
     ],
     test_suite='tests',