Skip to content

Commit 76e3428

Browse files
committed
update tox and Travis configs to use -norsa modes for pycrypto/dome test runs
1 parent a61a392 commit 76e3428

2 files changed

Lines changed: 14 additions & 12 deletions

File tree

.travis.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ matrix:
1616
- python: 2.7
1717
env: TOXENV=py27-cryptography-only
1818
- python: 2.7
19-
env: TOXENV=py27-pycryptodome
19+
env: TOXENV=py27-pycryptodome-norsa
2020
- python: 2.7
21-
env: TOXENV=py27-pycrypto
21+
env: TOXENV=py27-pycrypto-norsa
2222
- python: 2.7
2323
env: TOXENV=py27-compatibility
2424
# CPython 3.4
@@ -27,9 +27,9 @@ matrix:
2727
- python: 3.4
2828
env: TOXENV=py34-cryptography-only
2929
- python: 3.4
30-
env: TOXENV=py34-pycryptodome
30+
env: TOXENV=py34-pycryptodome-norsa
3131
- python: 3.4
32-
env: TOXENV=py34-pycrypto
32+
env: TOXENV=py34-pycrypto-norsa
3333
- python: 3.4
3434
env: TOXENV=py34-compatibility
3535
# CPython 3.5
@@ -38,9 +38,9 @@ matrix:
3838
- python: 3.5
3939
env: TOXENV=py35-cryptography-only
4040
- python: 3.5
41-
env: TOXENV=py35-pycryptodome
41+
env: TOXENV=py35-pycryptodome-norsa
4242
- python: 3.5
43-
env: TOXENV=py35-pycrypto
43+
env: TOXENV=py35-pycrypto-norsa
4444
- python: 3.5
4545
env: TOXENV=py35-compatibility
4646
# CPython 3.5
@@ -49,9 +49,9 @@ matrix:
4949
- python: 3.5
5050
env: TOXENV=py35-cryptography-only
5151
- python: 3.5
52-
env: TOXENV=py35-pycryptodome
52+
env: TOXENV=py35-pycryptodome-norsa
5353
- python: 3.5
54-
env: TOXENV=py35-pycrypto
54+
env: TOXENV=py35-pycrypto-norsa
5555
- python: 3.5
5656
env: TOXENV=py35-compatibility
5757
# PyPy 5.3.1
@@ -60,9 +60,9 @@ matrix:
6060
- python: pypy-5.3.1
6161
env: TOXENV=pypy-cryptography-only
6262
- python: pypy-5.3.1
63-
env: TOXENV=pypy-pycryptodome
63+
env: TOXENV=pypy-pycryptodome-norsa
6464
- python: pypy-5.3.1
65-
env: TOXENV=pypy-pycrypto
65+
env: TOXENV=pypy-pycrypto-norsa
6666
- python: pypy-5.3.1
6767
env: TOXENV=pypy-compatibility
6868
# matrix:

tox.ini

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
minversion = 3.4.0
33
envlist =
4-
py{27,34,35,36,py}-{base,cryptography-only,pycryptodome,pycrypto,compatibility},
4+
py{27,34,35,36,py}-{base,cryptography-only,pycryptodome-norsa,pycrypto-norsa,compatibility},
55
flake8
66
skip_missing_interpreters = True
77

@@ -23,8 +23,10 @@ deps =
2323
pytest-runner
2424
compatibility: {[testenv:compatibility]deps}
2525
commands_pre =
26-
# Remove the python-rsa backend
26+
# Remove the python-rsa and python-ecdsa backends
2727
only: pip uninstall -y ecdsa rsa
28+
# Remove just the python-rsa backend
29+
nosra: pip uninstall -y rsa
2830
commands =
2931
# Test the python-rsa backend
3032
base: {[testenv:basecommand]commands} -m "not (cryptography or pycryptodome or pycrypto or backend_compatibility)"

0 commit comments

Comments
 (0)