summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml4
-rw-r--r--tox.ini13
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:
diff --git a/tox.ini b/tox.ini
index 61c39369d..39132d9ff 100644
--- a/tox.ini
+++ b/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