Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,17 @@ matrix:
- python: "2.7"
env: TOXENV=pypi-readme

- python: "2.7"
env: TOXENV=flake8

- python: "2.7"
env: TOXENV=pyroma

# Let the cryptography master builds fail because they might be triggered by
# cryptography changes beyond our control.
# Also allow OS X and 0.9.8 to fail at the moment while we fix these new
# build configurations.
# Also allow lint to fail while we fix existing lint.
allow_failures:
- language: generic
os: osx
Expand All @@ -68,6 +74,7 @@ matrix:
- env: TOXENV=py34-cryptographyMaster
- env: TOXENV=pypy-cryptographyMaster
- env: OPENSSL=0.9.8 TOXENV=py27
- env: TOXENV=flake8

install:
- |
Expand Down
3 changes: 3 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ build-requires = lynx openssl-devel python-devel python-sphinx
group = Development/Libraries
build_script = rpm/build_script
doc-files = doc/_build/html

[flake8]
ignore = E303
14 changes: 13 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = {pypy,py26,py27,py33,py34}{,-cryptographyMaster},pypi-readme,check-manifest
envlist = {pypy,py26,py27,py33,py34}{,-cryptographyMaster},pypi-readme,check-manifest,flake8,pyroma

[testenv]
whitelist_externals =
Expand All @@ -20,6 +20,18 @@ commands =
coverage run --branch --source=OpenSSL setup.py test
coverage report -m

[testenv:flake8]
deps =
flake8
commands =
flake8 OpenSSL

[testenv:pyroma]
deps =
pyroma>=1.6 # <1.6 had bogus return values.
commands =
pyroma -d .

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no empty line please here :)

[testenv:pypi-readme]
deps =
readme
Expand Down