Skip to content

Commit 6741215

Browse files
committed
Fix tox.ini with optional packages. Kinda.
1 parent 1e49bc2 commit 6741215

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ env:
99
- TOXENV=py35
1010
install:
1111
- pip install -U pip
12-
- pip install -U Flask PyJWT six tox coverage coveralls cryptography
12+
- pip install -U tox coverage coveralls
1313
script:
1414
- tox
1515
after_success:

flask_jwt_extended/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# versions of pyjwt, it will kick it out as an unrecognized algorithm.
1313
try:
1414
from jwt.algorithms import requires_cryptography
15-
except ImportError:
15+
except ImportError: # pragma: no cover
1616
requires_cryptography = {'RS256', 'RS384', 'RS512', 'ES256', 'ES384',
1717
'ES521', 'ES512', 'PS256', 'PS384', 'PS512'}
1818

tox.ini

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,9 @@ envlist = py27, py33, py34, py35, py36
1010
commands =
1111
coverage run --source flask_jwt_extended/ -m unittest discover --start-directory tests
1212
coverage report -m
13-
deps = coverage
13+
deps =
14+
coverage
15+
cryptography
16+
# TODO why does this not work?
17+
# extras =
18+
# asymmetric_crypto

0 commit comments

Comments
 (0)