Skip to content

Commit

Permalink
Merge pull request #368 from mozilla-services/remove-2.6
Browse files Browse the repository at this point in the history
remove 2.6 from tox - fixes #367
  • Loading branch information
tarekziade committed Aug 22, 2016
2 parents 094df85 + 6e35302 commit 6684457
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 14 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ language: python
python: 2.7
sudo: false
env:
- TOX_ENV=py26
- TOX_ENV=py27
- TOX_ENV=py34
- TOX_ENV=flake8
Expand Down
14 changes: 1 addition & 13 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py26,py27,py34,flake8
envlist = py27,py34,flake8

[testenv]
commands =
Expand All @@ -16,18 +16,6 @@ deps =
rxjson
install_command = pip install --process-dependency-links --pre {opts} {packages}

[testenv:py26]
deps =
coverage
nose
webtest
mock
colander
Sphinx
rxjson
unittest2
importlib

[testenv:py34]
deps =
coverage
Expand Down

0 comments on commit 6684457

Please sign in to comment.