summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurens Van Houtven <_@lvh.io>2015-05-14 13:29:31 -0700
committerLaurens Van Houtven <_@lvh.io>2015-05-14 13:29:31 -0700
commitca1842f2a0971ffef06b8ea699f4b42e55d142a8 (patch)
treeca3ee0e7249864b5b0268958dc0f7e6ea558fcba
parentee4173baedd2a414d2618c337525c1f73fce86e3 (diff)
downloadpyopenssl-ca1842f2a0971ffef06b8ea699f4b42e55d142a8.tar.gz
Separate lint envs
-rw-r--r--.travis.yml10
-rw-r--r--tox.ini10
2 files changed, 14 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index cc63957..c75c65b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,7 +54,10 @@ matrix:
env: TOXENV=pypi-readme
- python: "2.7"
- env: TOXENV=lint
+ env: TOXENV=pyflakes
+
+ - python: "2.7"
+ env: TOXENV=pyroma
# Let the cryptography master builds fail because they might be triggered by
# cryptography changes beyond our control.
@@ -71,8 +74,9 @@ matrix:
- env: TOXENV=py34-cryptographyMaster
- env: TOXENV=pypy-cryptographyMaster
- env: OPENSSL=0.9.8 TOXENV=py27
- - env: TOXENV=lint
-
+ - env: TOXENV=pyflakes
+ - env: TOXENV=pyroma
+
install:
- |
if [[ "$(uname -s)" == 'Darwin' ]]; then
diff --git a/tox.ini b/tox.ini
index 5d755b8..2164039 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = {pypy,py26,py27,py33,py34}{,-cryptographyMaster},pypi-readme,check-manifest,lint
+envlist = {pypy,py26,py27,py33,py34}{,-cryptographyMaster},pypi-readme,check-manifest,pyflakes,pyroma
[testenv]
whitelist_externals =
@@ -20,12 +20,16 @@ commands =
coverage run --branch --source=OpenSSL setup.py test
coverage report -m
-[testenv:lint]
+[testenv:pyflakes]
deps =
pyflakes
- pyroma>=1.6 # <1.6 had bogus return values.
commands =
pyflakes OpenSSL
+
+[testenv:pyroma]
+deps =
+ pyroma>=1.6 # <1.6 had bogus return values.
+commands =
pyroma -d .
[testenv:pypi-readme]