commit python-PyJWT for openSUSE:Factory
Hello community, here is the log from the commit of package python-PyJWT for openSUSE:Factory checked in at 2018-11-28 11:14:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-PyJWT (Old) and /work/SRC/openSUSE:Factory/.python-PyJWT.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-PyJWT" Wed Nov 28 11:14:24 2018 rev:16 rq:652153 version:1.6.4 Changes: -------- --- /work/SRC/openSUSE:Factory/python-PyJWT/python-PyJWT.changes 2018-07-09 13:31:19.690492138 +0200 +++ /work/SRC/openSUSE:Factory/.python-PyJWT.new.19453/python-PyJWT.changes 2018-11-28 11:14:45.270784819 +0100 @@ -1,0 +2,12 @@ +Tue Nov 27 11:52:40 UTC 2018 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com> + +- Add patch to fix testsuite with pytest 3.9.0: + * pyjwt-pytest390.patch + +------------------------------------------------------------------- +Wed Nov 14 13:51:54 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com> + +- Add patch to build with python 3.7: + * pyjwt-python37.patch + +------------------------------------------------------------------- New: ---- pyjwt-pytest390.patch pyjwt-python37.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-PyJWT.spec ++++++ --- /var/tmp/diff_new_pack.FeaB1A/_old 2018-11-28 11:14:46.182783544 +0100 +++ /var/tmp/diff_new_pack.FeaB1A/_new 2018-11-28 11:14:46.182783544 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -25,6 +25,9 @@ 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} @@ -46,6 +49,9 @@ %prep %setup -q -n PyJWT-%{version} +%patch0 -p1 +%patch1 -p1 + dos2unix jwt/__main__.py %build ++++++ pyjwt-pytest390.patch ++++++ 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." ++++++ pyjwt-python37.patch ++++++
From 2122f94432d160a23e79a4771c05d71132dc6db9 Mon Sep 17 00:00:00 2001 From: kreutz-hs <43569762+kreutz-hs@users.noreply.github.com> Date: Fri, 2 Nov 2018 12:24:18 +0100 Subject: [PATCH] Support Python 3.7 (#375)
* Import collection ABC's from correct module They were moved into collections.abc in 3.3 and will be deprecated from collections in 3.8. --- CHANGELOG.md | 2 ++ jwt/api_jwt.py | 6 +++++- tox.ini | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/jwt/api_jwt.py b/jwt/api_jwt.py index 6caeecf..0836ec0 100644 --- a/jwt/api_jwt.py +++ b/jwt/api_jwt.py @@ -1,8 +1,12 @@ import json import warnings from calendar import timegm -from collections import Iterable, Mapping from datetime import datetime, timedelta +try: + # Importing ABCs from collections will be removed in PY3.8 + from collections.abc import Iterable, Mapping +except ImportError: + from collections import Iterable, Mapping try: # import required by mypy to perform type checking, not used for normal execution from typing import Callable, Dict, List, Optional, Union # NOQA
participants (1)
-
root