Permalink
Browse files

combine tox steps into lint

  • Loading branch information...
mmerickel committed Jun 29, 2017
1 parent e42ba53 commit 2ec353522bffb4e686231d6b0b380f86ab901a54
Showing with 5 additions and 12 deletions.
  1. +1 −3 .travis.yml
  2. +4 −9 tox.ini
View
@@ -19,9 +19,7 @@ matrix:
- python: 3.5
env: TOXENV=docs
- python: 3.5
env: TOXENV=pep8
- python: 3.5
env: TOXENV=sdist
env: TOXENV=lint
- python: nightly
env: TOXENV=py37
allow_failures:
View
13 tox.ini
@@ -1,8 +1,8 @@
[tox]
envlist =
lint,
py27,py34,py35,py36,pypy,
docs,pep8,sdist,
{py2,py3}-cover,coverage,
docs,{py2,py3}-cover,coverage,
[testenv]
# Most of these are defaults but if you specify any you can't fall back
@@ -51,19 +51,14 @@ commands =
python pyramid/scaffolds/tests.py
deps = virtualenv
[testenv:pep8]
[testenv:lint]
basepython = python3.5
commands =
flake8 pyramid/
deps =
flake8
[testenv:sdist]
basepython = python3.5
commands =
python setup.py check -r -s -m
check-manifest
deps =
flake8
readme_renderer
check-manifest

0 comments on commit 2ec3535

Please sign in to comment.