Skip to content

Commit b65e1ac

Browse files
committed
Fix pytest and pinned test dependencies
1 parent 3f735fd commit b65e1ac

File tree

6 files changed

+16
-7
lines changed

6 files changed

+16
-7
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
1212

1313
### Added
1414

15+
[v1.7.1][1.7.1]
16+
-------------------------------------------------------------------------
17+
18+
### Fixed
19+
20+
- Update test dependencies with pinned ranges
21+
- Fix pytest deprecation warnings
22+
1523
[v1.7.0][1.7.0]
1624
-------------------------------------------------------------------------
1725

@@ -228,6 +236,7 @@ rarely used. Users affected by this should upgrade to 3.3+.
228236
[1.6.3]: https://github.com/jpadilla/pyjwt/compare/1.6.1...1.6.3
229237
[1.6.4]: https://github.com/jpadilla/pyjwt/compare/1.6.3...1.6.4
230238
[1.7.0]: https://github.com/jpadilla/pyjwt/compare/1.6.4...1.7.0
239+
[1.7.1]: https://github.com/jpadilla/pyjwt/compare/1.7.0...1.7.1
231240

232241
[109]: https://github.com/jpadilla/pyjwt/pull/109
233242
[110]: https://github.com/jpadilla/pyjwt/pull/110

jwt/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111

1212
__title__ = 'pyjwt'
13-
__version__ = '1.7.0'
13+
__version__ = '1.7.1'
1414
__author__ = 'José Padilla'
1515
__license__ = 'MIT'
1616
__copyright__ = 'Copyright 2015-2018 José Padilla'

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ def get_version(package):
3333
sys.exit()
3434

3535
tests_require = [
36-
'pytest==3.7.1',
37-
'pytest-cov==2.5.1',
38-
'pytest-runner==4.2',
36+
'pytest>=4.0.1,<5.0.0',
37+
'pytest-cov>=2.6.0,<3.0.0',
38+
'pytest-runner>=4.2,<5.0.0',
3939
]
4040

4141
needs_pytest = set(('pytest', 'test', 'ptr')).intersection(sys.argv)

tests/test_api_jws.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ def test_decode_no_algorithms_verify_signature_false(self, jws):
294294
jws.decode, example_jws, key=example_secret,
295295
options={'verify_signature': False},
296296
)
297-
except AssertionError:
297+
except pytest.fail.Exception:
298298
pass
299299
else:
300300
assert False, "Unexpected DeprecationWarning raised."

tests/test_api_jwt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ def test_decode_no_algorithms_verify_false(self, jwt, payload):
516516
pytest.deprecated_call(
517517
jwt.decode, jwt_message, secret, verify=False,
518518
)
519-
except AssertionError:
519+
except pytest.fail.Exception:
520520
pass
521521
else:
522522
assert False, "Unexpected DeprecationWarning raised."

tests/test_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
(255, b'_w'),
1212
(65537, b'AQAB'),
1313
(123456789, b'B1vNFQ'),
14-
pytest.mark.xfail((-1, ''), raises=ValueError)
14+
pytest.param(-1, '', marks=pytest.mark.xfail(raises=ValueError))
1515
])
1616
def test_to_base64url_uint(inputval, expected):
1717
actual = to_base64url_uint(inputval)

0 commit comments

Comments
 (0)