From 63774861c2ef04d4d65fbfd17da87669b76030d8257eba3357a56de217e88974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 10 Mar 2020 10:06:24 +0000 Subject: [PATCH] - Update to 3.1.0: * Improve JWT.decode() #76 (fixes #75) * ort headers when serializing to allow for headless JWT #136 (fixes #80) * djust dependency handling * se PyCryptodome instead of PyCrypto #83 * pdate package dependencies #124 (fixes #158) * void using deprecated methods #85 * upport X509 certificates #107 * solate and flesh out cryptographic backends to enable independent operation #129 (fixes #114) * emove pyca/cryptography backend's dependency on python-ecdsa #117 * Remove pycrypto/dome backends' dependency on python-rsa #121 * Make pyca/cryptography backend the preferred backend if multiple backends are present #122 - Rebase patch unpin-deps.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-jose?expand=0&rev=5 --- python-jose-3.0.1.tar.gz | 3 --- python-jose-3.1.0.tar.gz | 3 +++ python-python-jose.changes | 17 ++++++++++++++++ python-python-jose.spec | 20 +++++++++---------- unpin-deps.patch | 41 +++++++++++++++----------------------- 5 files changed, 45 insertions(+), 39 deletions(-) delete mode 100644 python-jose-3.0.1.tar.gz create mode 100644 python-jose-3.1.0.tar.gz diff --git a/python-jose-3.0.1.tar.gz b/python-jose-3.0.1.tar.gz deleted file mode 100644 index 4b136d4..0000000 --- a/python-jose-3.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cdb3972009f6577904011bb9f015ee0ff07d3a6b86d22850e0c4e2338978acc1 -size 86726 diff --git a/python-jose-3.1.0.tar.gz b/python-jose-3.1.0.tar.gz new file mode 100644 index 0000000..014b56c --- /dev/null +++ b/python-jose-3.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73699139ecd3d28e44488ddfd22fc0f89598b793e0dc8bc7ebe8701837d4fbda +size 101693 diff --git a/python-python-jose.changes b/python-python-jose.changes index e631989..6bb4e48 100644 --- a/python-python-jose.changes +++ b/python-python-jose.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Mar 10 09:47:42 UTC 2020 - Tomáš Chvátal + +- Update to 3.1.0: + * Improve JWT.decode() #76 (fixes #75) + * ort headers when serializing to allow for headless JWT #136 (fixes #80) + * djust dependency handling + * se PyCryptodome instead of PyCrypto #83 + * pdate package dependencies #124 (fixes #158) + * void using deprecated methods #85 + * upport X509 certificates #107 + * solate and flesh out cryptographic backends to enable independent operation #129 (fixes #114) + * emove pyca/cryptography backend's dependency on python-ecdsa #117 + * Remove pycrypto/dome backends' dependency on python-rsa #121 + * Make pyca/cryptography backend the preferred backend if multiple backends are present #122 +- Rebase patch unpin-deps.patch + ------------------------------------------------------------------- Thu Apr 11 05:11:28 UTC 2019 - John Vandenberg diff --git a/python-python-jose.spec b/python-python-jose.spec index 25167cc..9eab8b7 100644 --- a/python-python-jose.spec +++ b/python-python-jose.spec @@ -1,7 +1,7 @@ # # spec file for package python-python-jose # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,29 +18,26 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-python-jose -Version: 3.0.1 +Version: 3.1.0 Release: 0 Summary: JOSE implementation in Python License: MIT -Group: Development/Languages/Python -URL: http://github.com/mpdavis/python-jose +URL: https://github.com/mpdavis/python-jose Source: https://github.com/mpdavis/python-jose/archive/%{version}.tar.gz#/python-jose-%{version}.tar.gz Patch0: unpin-deps.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-ecdsa -Requires: python-rsa Requires: python-six Recommends: python-cryptography +Recommends: python-pyasn1 Recommends: python-pycryptodome >= 3.3.1 BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module cryptography} -BuildRequires: %{python_module ecdsa} +BuildRequires: %{python_module pyasn1} BuildRequires: %{python_module pycryptodome >= 3.3.1} -BuildRequires: %{python_module pytest-runner} -BuildRequires: %{python_module rsa} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module six} # /SECTION %python_subpackages @@ -52,7 +49,8 @@ implementation in Python. %prep %setup -q -n python-jose-%{version} %patch0 -p1 -sed -i '/addopts/d' setup.cfg +sed -i -e '/addopts/d' setup.cfg +sed -i -e '/pytest-runner/d' setup.py %build %python_build @@ -62,7 +60,7 @@ sed -i '/addopts/d' setup.cfg %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%python_exec setup.py test +%pytest %files %{python_files} %doc README.rst diff --git a/unpin-deps.patch b/unpin-deps.patch index ee02938..d8d63ac 100644 --- a/unpin-deps.patch +++ b/unpin-deps.patch @@ -1,29 +1,20 @@ -Index: python-jose-3.0.1/setup.py +Index: python-jose-3.1.0/setup.py =================================================================== ---- python-jose-3.0.1.orig/setup.py -+++ python-jose-3.0.1/setup.py -@@ -23,8 +23,8 @@ def get_packages(package): - +--- python-jose-3.1.0.orig/setup.py ++++ python-jose-3.1.0/setup.py +@@ -35,11 +35,11 @@ def _cryptography_version(): + pyasn1 = ['pyasn1'] extras_require = { - 'cryptography': ['cryptography'], -- 'pycrypto': ['pycrypto >=2.6.0, <2.7.0'], -- 'pycryptodome': ['pycryptodome >=3.3.1, <4.0.0'], -+ 'pycrypto': ['pycrypto >=2.6.0'], -+ 'pycryptodome': ['pycryptodome >=3.3.1'], + 'cryptography': [_cryptography_version()], +- 'pycrypto': ['pycrypto >=2.6.0, <2.7.0'] + pyasn1, +- 'pycryptodome': ['pycryptodome >=3.3.1, <4.0.0'] + pyasn1, ++ 'pycrypto': ['pycrypto >=2.6.0'] + pyasn1, ++ 'pycryptodome': ['pycryptodome >=3.3.1'] + pyasn1, } +-legacy_backend_requires = ['ecdsa <1.0', 'rsa'] + pyasn1 +-install_requires = ['six <2.0'] ++legacy_backend_requires = ['ecdsa', 'rsa'] + pyasn1 ++install_requires = ['six'] - -@@ -58,12 +58,10 @@ setup( - setup_requires=['pytest-runner'], - tests_require=[ - 'six', -- 'future', - 'ecdsa', - 'pytest', -- 'pytest-cov', - 'pytest-runner', - 'cryptography', - ], -- install_requires=['six <2.0', 'ecdsa <1.0', 'rsa', 'future <1.0'] -+ install_requires=['six', 'ecdsa', 'rsa'] - ) + # TODO: work this into the extras selection instead. + install_requires += legacy_backend_requires