From 15ac49e4b8be5aa430c8d6bb29baf0bd4c28f131f36fa1016fb591f2b02b943c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 27 Nov 2018 12:00:34 +0000 Subject: [PATCH] Accepting request 652151 from home:glaubitz:branches:devel:languages:python - Add patch to fix testsuite with pytest 3.9.0: * pyjwt-pytest390.patch OBS-URL: https://build.opensuse.org/request/show/652151 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyJWT?expand=0&rev=37 --- pyjwt-pytest390.patch | 24 ++++++++++++++++++++++++ python-PyJWT.changes | 6 ++++++ python-PyJWT.spec | 3 +++ 3 files changed, 33 insertions(+) create mode 100644 pyjwt-pytest390.patch diff --git a/pyjwt-pytest390.patch b/pyjwt-pytest390.patch new file mode 100644 index 0000000..87863fe --- /dev/null +++ b/pyjwt-pytest390.patch @@ -0,0 +1,24 @@ +diff -Nru PyJWT-1.6.4.orig/tests/test_api_jws.py PyJWT-1.6.4/tests/test_api_jws.py +--- PyJWT-1.6.4.orig/tests/test_api_jws.py 2018-03-03 15:45:20.000000000 +0100 ++++ PyJWT-1.6.4/tests/test_api_jws.py 2018-11-27 12:48:14.393379717 +0100 +@@ -294,7 +294,7 @@ + jws.decode, example_jws, key=example_secret, + options={'verify_signature': False}, + ) +- except AssertionError: ++ except pytest.fail.Exception: + pass + else: + assert False, "Unexpected DeprecationWarning raised." +diff -Nru PyJWT-1.6.4.orig/tests/test_api_jwt.py PyJWT-1.6.4/tests/test_api_jwt.py +--- PyJWT-1.6.4.orig/tests/test_api_jwt.py 2018-03-18 14:35:35.000000000 +0100 ++++ PyJWT-1.6.4/tests/test_api_jwt.py 2018-11-27 12:48:24.217463350 +0100 +@@ -516,7 +516,7 @@ + pytest.deprecated_call( + jwt.decode, jwt_message, secret, verify=False, + ) +- except AssertionError: ++ except pytest.fail.Exception: + pass + else: + assert False, "Unexpected DeprecationWarning raised." diff --git a/python-PyJWT.changes b/python-PyJWT.changes index ed92953..032f7c6 100644 --- a/python-PyJWT.changes +++ b/python-PyJWT.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 27 11:52:40 UTC 2018 - John Paul Adrian Glaubitz + +- Add patch to fix testsuite with pytest 3.9.0: + * pyjwt-pytest390.patch + ------------------------------------------------------------------- Wed Nov 14 13:51:54 UTC 2018 - Tomáš Chvátal diff --git a/python-PyJWT.spec b/python-PyJWT.spec index b3cdb01..7521778 100644 --- a/python-PyJWT.spec +++ b/python-PyJWT.spec @@ -26,6 +26,8 @@ Group: Development/Languages/Python URL: https://github.com/progrium/pyjwt Source: https://files.pythonhosted.org/packages/source/P/PyJWT/PyJWT-%{version}.tar.gz Patch0: pyjwt-python37.patch +# fix testsuite with pytest >= 3.9.0, see: https://github.com/jpadilla/pyjwt/issues/382 +Patch1: pyjwt-pytest390.patch BuildRequires: %{python_module cryptography >= 1.4} BuildRequires: %{python_module devel} BuildRequires: %{python_module ecdsa} @@ -48,6 +50,7 @@ A Python implementation of JSON Web Token draft 01. %prep %setup -q -n PyJWT-%{version} %patch0 -p1 +%patch1 -p1 dos2unix jwt/__main__.py