diff options
| author | Michael Merickel <michael@merickel.org> | 2017-06-29 00:15:58 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2017-06-29 00:25:35 -0500 |
| commit | 2ec353522bffb4e686231d6b0b380f86ab901a54 (patch) | |
| tree | 40f3600df12f4e7e48d0ed4b3853d052d1809921 | |
| parent | e42ba531963c35a89818bf57f08b0ab87c04e8bf (diff) | |
| download | pyramid-2ec353522bffb4e686231d6b0b380f86ab901a54.tar.gz pyramid-2ec353522bffb4e686231d6b0b380f86ab901a54.tar.bz2 pyramid-2ec353522bffb4e686231d6b0b380f86ab901a54.zip | |
combine tox steps into lint
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | tox.ini | 13 |
2 files changed, 5 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index 05b655e64..1d4c4eeac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: @@ -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 |