diff options
| author | Michał Górny <mgorny@gentoo.org> | 2022-05-26 11:23:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-26 15:23:23 +0600 |
| commit | 8215bf8fd64db41fd7f4972fba905c4274a3e81c (patch) | |
| tree | 04f06b52f6967469142ab8580f71673595545b1c | |
| parent | 59065fa04d7d255f4a6452707af34fc9e4420d4d (diff) | |
| download | pyjwt-8215bf8fd64db41fd7f4972fba905c4274a3e81c.tar.gz | |
Adjust expected exceptions in option merging tests for PyPy3 (#763)
* Adjust expected exceptions in option merging tests for PyPy3
PyPy3 raises ValueError rather than TypeError when trying to combine
a dict and a str in dict unpacking. Update the test expectations
appropriately.
Fixes #580
* Enable GHA testing on Python 3.11 and all PyPy3 versions
Enable testing on all Python 3 versions supported by GitHub Actions
at the moment. While at it, fix the tox invocation for Python 3.10.
* drop pypy3.7 from tox
Co-authored-by: Asif Saif Uddin <auvipy@gmail.com>
| -rw-r--r-- | .github/workflows/main.yml | 3 | ||||
| -rw-r--r-- | tests/test_api_jws.py | 4 | ||||
| -rw-r--r-- | tox.ini | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5e4843f..148933f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,8 @@ jobs: strategy: matrix: platform: ["ubuntu-latest", "windows-latest"] - python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"] + python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", + "3.11.0-beta - 3.11", "pypy-3.8", "pypy-3.9"] steps: - uses: "actions/checkout@v3" diff --git a/tests/test_api_jws.py b/tests/test_api_jws.py index 0a0e295..23975fa 100644 --- a/tests/test_api_jws.py +++ b/tests/test_api_jws.py @@ -83,7 +83,7 @@ class TestJWS: def test_options_must_be_dict(self, jws): pytest.raises(TypeError, PyJWS, options=object()) - pytest.raises(TypeError, PyJWS, options=("something")) + pytest.raises((TypeError, ValueError), PyJWS, options=("something")) def test_encode_decode(self, jws, payload): secret = "secret" @@ -607,7 +607,7 @@ class TestJWS: with pytest.raises(TypeError): jws.decode(token, "secret", options=object()) - with pytest.raises(TypeError): + with pytest.raises((TypeError, ValueError)): jws.decode(token, "secret", options="something") def test_custom_json_encoder(self, jws, payload): @@ -13,13 +13,16 @@ python = 3.8: py38, typing 3.9: py39 3.10: py310 + 3.11: py311 + pypy-3.8: pypy3 + pypy-3.9: pypy3 [tox] envlist = lint typing - py{36,37,38,39}-{crypto,nocrypto} + py{36,37,38,39,310,311,py3}-{crypto,nocrypto} docs pypi-description coverage-report |