Merge remote-tracking branch 'upstream/master'

jimbaker · jimbaker · commit 08e7eb5babb5 · 2014-08-12T19:16:33.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ python:
   - "2.7"
   - "3.2"
   - "3.3"
+  - "3.4"
   - "pypy"
 
 env:
@@ -14,12 +15,12 @@ matrix:
   exclude:
     - python: "2.7"
       env: USE_OPTIONAL=false
-    - python: "3.3"
+    - python: "3.4"
       env: USE_OPTIONAL=false
   include:
     - python: "2.7"
       env: USE_OPTIONAL=false FLAKE=true
-    - python: "3.3"
+    - python: "3.4"
       env: USE_OPTIONAL=false FLAKE=true
 
 before_install:
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py32,py33,pypy
+envlist = py26,py27,py32,py33,py34,pypy
 
 [testenv]
 deps =
@@ -10,7 +10,7 @@ commands =
   {envbindir}/nosetests -q
   {toxinidir}/flake8-run.sh
 install_command =
-  pip install --allow-external Genshi --allow-insecure Genshi {opts} {packages}
+  pip install {opts} {packages}
 
 [testenv:pypy]
 # lxml doesn't work and datrie doesn't make sense
