From 85375aee7f989d8a0e7fd03e7f67f1a928770cbb93e3895ad105351d0ce089c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Thu, 2 Nov 2023 09:08:56 +0000 Subject: [PATCH 1/2] Accepting request 1122196 from home:gladiac:mailman - Update to v0.58.1 * See https://github.com/pennersr/django-allauth/blob/0.58.1/ChangeLog.rst or the ChangeLog.rst included in this package OBS-URL: https://build.opensuse.org/request/show/1122196 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:django/python-django-allauth?expand=0&rev=17 --- django-allauth-0.54.0.tar.gz | 3 --- django-allauth-0.58.1.tar.gz | 3 +++ missing-template-in-test.patch | 16 +++++++++------- python-django-allauth.changes | 7 +++++++ python-django-allauth.spec | 27 +++++++++++++++------------ 5 files changed, 34 insertions(+), 22 deletions(-) delete mode 100644 django-allauth-0.54.0.tar.gz create mode 100644 django-allauth-0.58.1.tar.gz diff --git a/django-allauth-0.54.0.tar.gz b/django-allauth-0.54.0.tar.gz deleted file mode 100644 index e3f967b..0000000 --- a/django-allauth-0.54.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:120e265f802b65738899c6cb627b827fde46a4d03067034c633f516c2adf3e3e -size 737122 diff --git a/django-allauth-0.58.1.tar.gz b/django-allauth-0.58.1.tar.gz new file mode 100644 index 0000000..39b1729 --- /dev/null +++ b/django-allauth-0.58.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:485db513f1794f5636ae38a78e9414e8818ce076770b75a6f8a003ab3a32b8fa +size 862029 diff --git a/missing-template-in-test.patch b/missing-template-in-test.patch index 0786277..405e39b 100644 --- a/missing-template-in-test.patch +++ b/missing-template-in-test.patch @@ -1,6 +1,8 @@ ---- a/allauth/account/tests.py 2023-07-29 03:13:58.816192704 +0200 -+++ b/allauth/account/tests.py 2023-07-29 03:14:17.592388201 +0200 -@@ -1740,7 +1740,7 @@ +Index: django-allauth-0.58.1/allauth/account/tests/test_ratelimit.py +=================================================================== +--- django-allauth-0.58.1.orig/allauth/account/tests/test_ratelimit.py 2023-11-02 09:22:23.776697894 +0100 ++++ django-allauth-0.58.1/allauth/account/tests/test_ratelimit.py 2023-11-02 09:22:34.456792940 +0100 +@@ -22,7 +22,7 @@ class RateLimitTests(TestCase): reverse("account_reset_password"), data={"email": "a@b.com"} ) assert resp.status_code == 302 @@ -8,7 +10,7 @@ - reverse("account_reset_password"), data={"email": "A@B.COM"} - ) - assert resp.status_code == 429 -+ #resp = self.client.post( -+ # reverse("account_reset_password"), data={"email": "A@B.COM"} -+ #) -+ #assert resp.status_code == 429 ++ # resp = self.client.post( ++ # reverse("account_reset_password"), data={"email": "A@B.COM"} ++ # ) ++ # assert resp.status_code == 429 diff --git a/python-django-allauth.changes b/python-django-allauth.changes index 23eabfb..2f37d6b 100644 --- a/python-django-allauth.changes +++ b/python-django-allauth.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 2 07:54:22 UTC 2023 - Andreas Schneider + +- Update to v0.58.1 + * See https://github.com/pennersr/django-allauth/blob/0.58.1/ChangeLog.rst + or the ChangeLog.rst included in this package + ------------------------------------------------------------------- Sat Jul 29 00:48:53 UTC 2023 - Georg Pfuetzenreuter diff --git a/python-django-allauth.spec b/python-django-allauth.spec index 9c6e9ac..571bc7b 100644 --- a/python-django-allauth.spec +++ b/python-django-allauth.spec @@ -18,7 +18,7 @@ %{?sle15_python_module_pythons} Name: python-django-allauth -Version: 0.54.0 +Version: 0.58.1 Release: 0 Summary: Django authentication, registration, account management License: MIT @@ -26,7 +26,12 @@ Group: Development/Languages/Python URL: https://github.com/pennersr/django-allauth Source: https://files.pythonhosted.org/packages/source/d/django-allauth/django-allauth-%{version}.tar.gz Patch: missing-template-in-test.patch -BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module Django >= 2.0} +BuildRequires: %{python_module pip} +BuildRequires: %{python_module python3-openid >= 3.0.8} +BuildRequires: %{python_module requests-oauthlib >= 0.3.0} +BuildRequires: %{python_module requests} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-Django >= 2.0 @@ -35,10 +40,11 @@ Requires: python-requests Requires: python-requests-oauthlib >= 0.3.0 BuildArch: noarch # SECTION test requirements -BuildRequires: %{python_module Django >= 2.0} -BuildRequires: %{python_module python3-openid >= 3.0.8} -BuildRequires: %{python_module requests-oauthlib >= 0.3.0} -BuildRequires: %{python_module requests} +BuildRequires: %{python_module Pillow} +BuildRequires: %{python_module pytest-django} +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module python3-saml} +BuildRequires: %{python_module qrcode} # /SECTION %python_subpackages @@ -48,22 +54,19 @@ account management as well as 3rd party (social) account authentication. %prep %autosetup -p1 -n django-allauth-%{version} -# Five errors reported at https://github.com/pennersr/django-allauth/issues/2210 -# Cern provider test module fails -rm allauth/socialaccount/providers/cern/tests.py # 2 tests failing with KeyError: 'location' (not in response headers) sed -i 's/test_login/_test_login/' allauth/socialaccount/providers/openid/tests.py %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -export PYTHONPATH=. +export PYTHONPATH="$(pwd)" %python_expand django-admin-%{$python_bin_suffix} test --settings=test_settings %files %{python_files} From 102e2f0fd893ea4c4f714d0efd6c13a97a43554f0dbdede3ea9413a5a13faff0 Mon Sep 17 00:00:00 2001 From: John Vandenberg Date: Mon, 6 Nov 2023 01:51:07 +0000 Subject: [PATCH 2/2] Accepting request 1123456 from home:darix:branches:devel:languages:python:mailman - make it easier to notice to keep buildrequires and runtime requires version limits in sync. This will also help us to notice early when the version of other libraries do not match the requires encoded in the source code. OBS-URL: https://build.opensuse.org/request/show/1123456 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:django/python-django-allauth?expand=0&rev=18 --- python-django-allauth.changes | 8 +++++++ python-django-allauth.spec | 43 ++++++++++++++++++++++++----------- 2 files changed, 38 insertions(+), 13 deletions(-) diff --git a/python-django-allauth.changes b/python-django-allauth.changes index 2f37d6b..aa8f08e 100644 --- a/python-django-allauth.changes +++ b/python-django-allauth.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Nov 6 00:48:51 UTC 2023 - Marcus Rueckert + +- make it easier to notice to keep buildrequires and runtime + requires version limits in sync. This will also help us to notice + early when the version of other libraries do not match the + requires encoded in the source code. + ------------------------------------------------------------------- Thu Nov 2 07:54:22 UTC 2023 - Andreas Schneider diff --git a/python-django-allauth.spec b/python-django-allauth.spec index 571bc7b..3f3d262 100644 --- a/python-django-allauth.spec +++ b/python-django-allauth.spec @@ -15,6 +15,20 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # +# keep in sync in setup.cfg +%global django_min_version 3.2 +%global python3_openid_min_version 3.0.8 +%global requests_oauthlib_min_version 0.3.0 +%global requests_min_version 2.0.0 +%global pyjwt_min_version 1.7 +# optional extra requires +%global python3_saml_min_version 1.15.0 +%global python3_saml_max_version 2.0.0 +%global qrcode_min_version 7.0.0 +# testing +%global pillow_min_version 9.0 +%global pytest_min_version 7.4 +%global pytest_django_min_version 4.5.2 %{?sle15_python_module_pythons} Name: python-django-allauth @@ -26,25 +40,28 @@ Group: Development/Languages/Python URL: https://github.com/pennersr/django-allauth Source: https://files.pythonhosted.org/packages/source/d/django-allauth/django-allauth-%{version}.tar.gz Patch: missing-template-in-test.patch -BuildRequires: %{python_module Django >= 2.0} +BuildRequires: %{python_module Django >= %{django_min_version}} BuildRequires: %{python_module pip} -BuildRequires: %{python_module python3-openid >= 3.0.8} -BuildRequires: %{python_module requests-oauthlib >= 0.3.0} -BuildRequires: %{python_module requests} +BuildRequires: %{python_module python3-openid >= %{python3_openid_min_version}} +BuildRequires: %{python_module requests-oauthlib >= %{requests_oauthlib_min_version}} +BuildRequires: %{python_module requests >= %{requests_min_version}} BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-Django >= 2.0 -Requires: python-python3-openid >= 3.0.8 -Requires: python-requests -Requires: python-requests-oauthlib >= 0.3.0 +Requires: python-Django >= %{django_min_version} +Requires: python-python3-openid >= %{python3_openid_min_version} +Requires: python-requests >= %{requests_min_version} +Requires: python-requests-oauthlib >= %{requests_oauthlib_min_version} +Requires: python-PyJWT >= %{pyjwt_min_version} +Recommends: (python-python3-saml >= %{python3_saml_min_version} with python-python3-saml < %{python3_saml_max_version}) +Recommends: python-qrcode >= %{qrcode_min_version} BuildArch: noarch # SECTION test requirements -BuildRequires: %{python_module Pillow} -BuildRequires: %{python_module pytest-django} -BuildRequires: %{python_module pytest} -BuildRequires: %{python_module python3-saml} -BuildRequires: %{python_module qrcode} +BuildRequires: %{python_module Pillow >= %{pillow_min_version}} +BuildRequires: %{python_module pytest-django >= %{pytest_django_min_version}} +BuildRequires: %{python_module pytest >= %{pytest_min_version}} +BuildRequires: %{python_module python3-saml >= %{python3_saml_min_version}} +BuildRequires: %{python_module qrcode >= %{qrcode_min_version}} # /SECTION %python_subpackages