From e3d875f195fc8ca874073e977c085cdb9bf1bd4e Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Mon, 8 Feb 2021 11:31:15 +0100 Subject: [PATCH] Update to upstream 3.1.0 Gets rid of obsolete python-nose dependency Nuke the python2/python3 conditionals, let's only support python3 --- .gitignore | 1 + python-oauthlib.spec | 84 ++++---------------------------------------- sources | 2 +- 3 files changed, 9 insertions(+), 78 deletions(-) diff --git a/.gitignore b/.gitignore index 99e62a9..f7f9458 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /oauthlib-2.0.1.tar.gz /v2.1.0.tar.gz /oauthlib-3.0.2.tar.gz +/oauthlib-3.1.0.tar.gz diff --git a/python-oauthlib.spec b/python-oauthlib.spec index e7da900..985061a 100644 --- a/python-oauthlib.spec +++ b/python-oauthlib.spec @@ -1,26 +1,8 @@ -%if (0%{?fedora} > 0 && 0%{?fedora} < 32) || (0%{?rhel} > 0 && 0%{?rhel} <= 7) - %bcond_without python2 - %bcond_without python3 -%endif - -%if 0%{?fedora} || 0%{?rhel} >= 8 - %bcond_with python2 - %bcond_without python3 -%endif - -%if 0%{?rhel} && 0%{?rhel} <= 7 -%{!?__python2: %global __python2 /usr/bin/python2} -%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%{!?py2_build: %global py2_build %{__python2} setup.py build --executable="%{__python2} -s" %{?*}} -%{!?py2_install: %global py2_install %{__python2} setup.py install --skip-build --root %{buildroot} %{?*}} -%endif - %global modname oauthlib Name: python-oauthlib -Version: 3.0.2 -Release: 12%{?dist} +Version: 3.1.0 +Release: 1%{?dist} Summary: An implementation of the OAuth request-signing logic License: BSD @@ -45,35 +27,6 @@ onto your favourite web framework. If you're a maintainer of such a library, write a thin veneer on top of OAuthLib and get OAuth support for very little effort. -%if %{with python2} -%package -n python2-oauthlib -Summary: An implementation of the OAuth request-signing logic -%{?python_provide:%python_provide python2-oauthlib} - -BuildRequires: python2-devel -BuildRequires: python2-setuptools - -BuildRequires: python2-nose -BuildRequires: python2-mock -BuildRequires: python2-blinker - -BuildRequires: python2-jwt >= 1.6.0 -BuildRequires: python2-cryptography >= 1.4.0 - -Requires: python2-jwt >= 1.6.0 -Requires: python2-cryptography >= 1.4.0 - -%description -n python2-oauthlib -OAuthLib is a generic utility which implements the logic of OAuth without -assuming a specific HTTP request object or web framework. Use it to graft -OAuth client support onto your favorite HTTP library, or provider support -onto your favourite web framework. If you're a maintainer of such a -library, write a thin veneer on top of OAuthLib and get OAuth support for -very little effort. - -%endif # with python2 - -%if %{with python3} %package -n python3-oauthlib Summary: An implementation of the OAuth request-signing logic %{?python_provide:%python_provide python3-oauthlib} @@ -81,7 +34,6 @@ Summary: An implementation of the OAuth request-signing logic BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-nose BuildRequires: python3-mock BuildRequires: python3-blinker @@ -102,8 +54,6 @@ very little effort. %{?python_extras_subpkg:%python_extras_subpkg -n python3-oauthlib -i %{python3_sitelib}/%{modname}-%{version}-*.egg-info signedtoken} -%endif # with python3 - %prep %setup -q -n %{modname}-%{version} @@ -115,44 +65,19 @@ sed -i "s/'unittest2', //" setup.py rm -rf %{modname}.egg-info %build -%if %{with python2} -%py2_build -%endif # with python2 -%if %{with python3} %py3_build -%endif # with python3 %install -%if %{with python2} -%py2_install -%endif # with python2 -%if %{with python3} %py3_install -%endif # with python3 %check -%if %{with python2} -%{__python2} setup.py test -%endif # with python2 -%if %{with python3} %{__python3} setup.py test -%endif # with python3 -%if %{with python2} -%files -n python2-oauthlib -%doc README.rst -%license LICENSE -%{python2_sitelib}/%{modname}/ -%{python2_sitelib}/%{modname}-%{version}* -%endif # with python2 - -%if %{with python3} %files -n python3-oauthlib %doc README.rst %license LICENSE %{python3_sitelib}/%{modname}/ %{python3_sitelib}/%{modname}-%{version}-* -%endif # with python3 %changelog * Fri Jan 21 2022 Fedora Release Engineering - 3.0.2-12 @@ -164,6 +89,11 @@ rm -rf %{modname}.egg-info * Thu Jun 03 2021 Python Maint - 3.0.2-10 - Rebuilt for Python 3.10 +* Mon Feb 8 2021 Jakub Hrozek - 3.1.0-1 +- Update to upstream 3.1.0 +- Gets rid of obsolete python-nose dependency +- Nuke the python2/python3 conditionals, let's only support python3 + * Wed Jan 27 2021 Fedora Release Engineering - 3.0.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index a1abc48..c9732cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (oauthlib-3.0.2.tar.gz) = 7a91696d4fa753c2075449a9ca6122d49042ec4a318051f75c6c80b4b77caac17a91e7c4e861f6c1d697c5c80b91f7d4a0c95736cbe386857faad8467b161310 +SHA512 (oauthlib-3.1.0.tar.gz) = 40c79204bc3588e4c654f27380e427478959b33887ce29ca6dcef212356a4aaf4f5035534612f11a15b724028b4331cc66c75c3a03d75306d0d1362c4519810a