Merge branch 'master' into pr/823

2015-07-22 12:55:27 -04:00 · 2015-07-22 12:55:27 -04:00 · 2258bcc2d7
commit 2258bcc2d7
parent adc1cf8829 d10b1d17cc
2 changed files with 1 additions and 7 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -2,7 +2,6 @@ sudo: false
 language: python
 python:
  - "pypy"
-  - "2.6"
  - "2.7"
  - "3.3"
  - "3.4"
--- a/tox.ini
+++ b/tox.ini
@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,pypy,py33,flake8
+envlist = py27,pypy,py33,flake8
 skipsdist = True

 [testenv]
@ -9,10 +9,5 @@ commands =
 deps =
 -rrequirements-dev.txt

-[testenv:py26]
-deps =
- {[testenv]deps}
- unittest2
-
 [testenv:flake8]
 commands = flake8 hy bin tests