diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-05-17 22:34:56 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-05-17 22:34:56 -0700 |
| commit | 5b8126f3fc94290b06f6c4414dbd8b53ad3385dd (patch) | |
| tree | bfae947007de7663206046e00af02182f1e3483b | |
| parent | a212afe2b09c9160b4221cad0827fcefd016328b (diff) | |
| download | cryptography-5b8126f3fc94290b06f6c4414dbd8b53ad3385dd.tar.gz cryptography-5b8126f3fc94290b06f6c4414dbd8b53ad3385dd.tar.bz2 cryptography-5b8126f3fc94290b06f6c4414dbd8b53ad3385dd.zip | |
Move to being a part of the pep8 job
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | tox.ini | 13 |
2 files changed, 6 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index e882403a..cacd1e27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,6 @@ env: - TOX_ENV=docs - TOX_ENV=pep8 - TOX_ENV=py3pep8 - - TOX_ENV=doc8 install: - ./.travis/install.sh @@ -50,9 +49,6 @@ matrix: - os: osx env: TOX_ENV=py3pep8 compiler: clang - - os: osx - env: TOX_ENV=doc8 - compiler: clang - os: linux env: TOX_ENV=docs @@ -63,6 +59,3 @@ matrix: - os: linux env: TOX_ENV=py3pep8 compiler: clang - - os: linux - env: TOX_ENV=doc8 - compiler: clang @@ -1,5 +1,5 @@ [tox] -envlist = py26,py27,pypy,py32,py33,py34,docs,pep8,py3pep8,doc8 +envlist = py26,py27,pypy,py32,py33,py34,docs,pep8,py3pep8 [testenv] # If you add a new dep here you probably need to add it in setup.py as well @@ -42,23 +42,22 @@ commands = [testenv:pep8] deps = + doc8 flake8 flake8-import-order pep8-naming -commands = flake8 . +commands = + flake8 . + doc8 README.rst docs/ [testenv:py3pep8] -basepython = python3.3 +basepython = python3 deps = flake8 flake8-import-order pep8-naming commands = flake8 . -[testenv:doc8] -deps = doc8 -commands = doc8 README.rst docs/ - [flake8] exclude = .tox,*.egg select = E,W,F,N,I |