From d907e187d3f596983fdf1dfa306f55e6c344517e52375730bd96a68a8766e499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 11 Apr 2019 09:00:34 +0000 Subject: [PATCH] Accepting request 693036 from home:jayvdb:django - Activate test suite, using GitHub archive - Add unpin-deps.patch to fix broken installed egg-info, and remove unused dependency on python-future - Remove undesirable < comparator in build and runtime dependencies, and remove duplicated dependencies OBS-URL: https://build.opensuse.org/request/show/693036 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-jose?expand=0&rev=3 --- python-jose-3.0.1.tar.gz | 4 ++-- python-python-jose.changes | 9 +++++++++ python-python-jose.spec | 22 +++++++++++----------- unpin-deps.patch | 29 +++++++++++++++++++++++++++++ 4 files changed, 51 insertions(+), 13 deletions(-) create mode 100644 unpin-deps.patch diff --git a/python-jose-3.0.1.tar.gz b/python-jose-3.0.1.tar.gz index c730fa7..4b136d4 100644 --- a/python-jose-3.0.1.tar.gz +++ b/python-jose-3.0.1.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed7387f0f9af2ea0ddc441d83a6eb47a5909bd0c8a72ac3250e75afec2cc1371 -size 19427 +oid sha256:cdb3972009f6577904011bb9f015ee0ff07d3a6b86d22850e0c4e2338978acc1 +size 86726 diff --git a/python-python-jose.changes b/python-python-jose.changes index 87c3023..e631989 100644 --- a/python-python-jose.changes +++ b/python-python-jose.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Apr 11 05:11:28 UTC 2019 - John Vandenberg + +- Activate test suite, using GitHub archive +- Add unpin-deps.patch to fix broken installed egg-info, + and remove unused dependency on python-future +- Remove undesirable < comparator in build and runtime dependencies, + and remove duplicated dependencies + ------------------------------------------------------------------- Thu Nov 15 00:12:07 UTC 2018 - Todd R diff --git a/python-python-jose.spec b/python-python-jose.spec index 5bf9097..25167cc 100644 --- a/python-python-jose.spec +++ b/python-python-jose.spec @@ -1,7 +1,7 @@ # # spec file for package python-python-jose # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,28 +24,23 @@ Summary: JOSE implementation in Python License: MIT Group: Development/Languages/Python URL: http://github.com/mpdavis/python-jose -Source: https://files.pythonhosted.org/packages/source/p/python-jose/python-jose-%{version}.tar.gz +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 < 1.0 -Requires: python-future < 1.0 +Requires: python-ecdsa Requires: python-rsa -Requires: python-six < 2.0 +Requires: python-six Recommends: python-cryptography Recommends: python-pycryptodome >= 3.3.1 BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module cryptography} -BuildRequires: %{python_module ecdsa < 1.0} BuildRequires: %{python_module ecdsa} -BuildRequires: %{python_module future < 1.0} -BuildRequires: %{python_module future} -BuildRequires: %{python_module pytest-cov} +BuildRequires: %{python_module pycryptodome >= 3.3.1} BuildRequires: %{python_module pytest-runner} -BuildRequires: %{python_module pytest} BuildRequires: %{python_module rsa} -BuildRequires: %{python_module six < 2.0} BuildRequires: %{python_module six} # /SECTION %python_subpackages @@ -56,6 +51,8 @@ implementation in Python. %prep %setup -q -n python-jose-%{version} +%patch0 -p1 +sed -i '/addopts/d' setup.cfg %build %python_build @@ -64,6 +61,9 @@ implementation in Python. %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +%check +%python_exec setup.py test + %files %{python_files} %doc README.rst %license LICENSE diff --git a/unpin-deps.patch b/unpin-deps.patch new file mode 100644 index 0000000..ee02938 --- /dev/null +++ b/unpin-deps.patch @@ -0,0 +1,29 @@ +Index: python-jose-3.0.1/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): + + 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'], + } + + +@@ -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'] + )