Merge branch 'master' into pr/823

This commit is contained in:
Paul Tagliamonte 2015-07-22 12:55:27 -04:00
commit 2258bcc2d7
2 changed files with 1 additions and 7 deletions

View File

@ -2,7 +2,6 @@ sudo: false
language: python language: python
python: python:
- "pypy" - "pypy"
- "2.6"
- "2.7" - "2.7"
- "3.3" - "3.3"
- "3.4" - "3.4"

View File

@ -1,5 +1,5 @@
[tox] [tox]
envlist = py26,py27,pypy,py33,flake8 envlist = py27,pypy,py33,flake8
skipsdist = True skipsdist = True
[testenv] [testenv]
@ -9,10 +9,5 @@ commands =
deps = deps =
-rrequirements-dev.txt -rrequirements-dev.txt
[testenv:py26]
deps =
{[testenv]deps}
unittest2
[testenv:flake8] [testenv:flake8]
commands = flake8 hy bin tests commands = flake8 hy bin tests