diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-20 13:38:36 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-01-20 13:38:36 -0600 |
| commit | 1de55b76b12d7ade3e19f2c8e094695201d1523f (patch) | |
| tree | 2e4537ec44634106da56a0bf38beab667e480dc4 /tox.ini | |
| parent | 5ab6a208c46f1de6e261646a0ad34482ea755922 (diff) | |
| parent | cd10571261ad24dcd0dc63c9703289faccd841a8 (diff) | |
| download | cryptography-1de55b76b12d7ade3e19f2c8e094695201d1523f.tar.gz cryptography-1de55b76b12d7ade3e19f2c8e094695201d1523f.tar.bz2 cryptography-1de55b76b12d7ade3e19f2c8e094695201d1523f.zip | |
Merge branch 'master' into commoncrypto-cipher-backend
* master:
expand tox backend example
On OS X at build time compile the CC bindings
fix docs
update docs for name attribute
revert fixture decorator for now, switch to append. no more globals
docs for explicit backend selection and document name attribute of backend
modify backend selection to allow multiple backends via comma delimiter
better name for the variable
don't mutate _ALL_BACKENDS
pass posargs via tox so --backend can be used for tox envs
support --backend as a pytest flag to limit to one backend for testing
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -8,7 +8,7 @@ deps = pretend pytest commands = - coverage run --source=cryptography/,tests/ -m pytest --capture=no --strict + coverage run --source=cryptography/,tests/ -m pytest --capture=no --strict {posargs} coverage report -m [testenv:docs] @@ -28,7 +28,7 @@ commands = # Temporarily disable coverage on pypy because of performance problems with # coverage.py on pypy. [testenv:pypy] -commands = py.test --capture=no --strict +commands = py.test --capture=no --strict {posargs} [testenv:pep8] deps = flake8 |