From 3bf1cce095842bbe499ef2687924d0629e27142e Mon Sep 17 00:00:00 2001 From: bbrucezhang Date: Mon, 3 Nov 2025 16:01:18 +0800 Subject: [PATCH 1/2] Update to 1.3.15 --- django-mailman3-django42.diff | 11 ------- django-mailman3-django52.patch | 11 +++++++ django-mailman3-localdeps.patch | 8 ++--- django-mailman3-py312-no-assertEquals.diff | 35 ---------------------- python-django-mailman3.spec | 31 ++++++++++--------- sources | 2 +- 6 files changed, 33 insertions(+), 65 deletions(-) delete mode 100644 django-mailman3-django42.diff create mode 100644 django-mailman3-django52.patch delete mode 100644 django-mailman3-py312-no-assertEquals.diff diff --git a/django-mailman3-django42.diff b/django-mailman3-django42.diff deleted file mode 100644 index c59bb14..0000000 --- a/django-mailman3-django42.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -38,7 +38,7 @@ setup( - packages=find_packages(), - include_package_data=True, - install_requires=[ -- 'django>=3.2,<4.2', -+ 'django>=3.2,<4.3', - 'mailmanclient>=3.3.3', - 'django-allauth', - 'django-gravatar2 >= 1.0.6', diff --git a/django-mailman3-django52.patch b/django-mailman3-django52.patch new file mode 100644 index 0000000..06d4f40 --- /dev/null +++ b/django-mailman3-django52.patch @@ -0,0 +1,11 @@ +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -19,7 +19,7 @@ classifiers = [ + dependencies = [ + "django-allauth[socialaccount,openid]>=0.63", + "django-gravatar2 >= 1.0.6", +- "django>=4.2,<5.1", ++ "django>=4.2,<5.3", + "mailmanclient>=3.3.3", + ] + requires-python = ">=3.9" diff --git a/django-mailman3-localdeps.patch b/django-mailman3-localdeps.patch index ebc0c7d..3805f87 100644 --- a/django-mailman3-localdeps.patch +++ b/django-mailman3-localdeps.patch @@ -1,11 +1,11 @@ --- a/tox.ini +++ b/tox.ini -@@ -6,7 +6,7 @@ envlist = py{37,38,39,310}-django{32,40, +@@ -6,7 +6,7 @@ envlist = py{39,310,311,312}-django{42,5 usedevelop = True deps = dev: -e../mailmanclient - git+https://gitlab.com/mailman/mailmanclient.git + mailmanclient - django32: django>=3.2,<3.3 - django40: django>=4.0,<4.1 - django41: django>=4.1,<4.2 + django42: django>=4.2,<4.3 + django50: django>=5.0,<5.1 + pytest-django diff --git a/django-mailman3-py312-no-assertEquals.diff b/django-mailman3-py312-no-assertEquals.diff deleted file mode 100644 index ac3ba0c..0000000 --- a/django-mailman3-py312-no-assertEquals.diff +++ /dev/null @@ -1,35 +0,0 @@ -From 6f0788fb5bfeda56d9ba16c7d29225d6b18019e9 Mon Sep 17 00:00:00 2001 -From: Michel Alexandre Salim -Date: Fri, 21 Jul 2023 10:26:59 -0500 -Subject: [PATCH] [Python 3.12] remove remaining use of assertEquals - -These have been deprecated for a while and now fully removed: - -https://docs.python.org/3.12/whatsnew/3.12.html#removed - -Another test already uses `assertEqual` so this should be fine -on all Python releases `django_mailman3` currently supports. - -Signed-off-by: Michel Alexandre Salim ---- - django_mailman3/tests/test_delete_account.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/django_mailman3/tests/test_delete_account.py b/django_mailman3/tests/test_delete_account.py -index 3520332..e486399 100644 ---- a/django_mailman3/tests/test_delete_account.py -+++ b/django_mailman3/tests/test_delete_account.py -@@ -50,8 +50,8 @@ class AccountDeletionTests(TestCase): - self.assertTrue(Profile.objects.filter(user_id=user_id).exists()) - response = self.client.post( - reverse('mm_user_account_delete'), {}) -- self.assertEquals(response.url, '/') -- self.assertEquals(response.status_code, 302) -+ self.assertEqual(response.url, '/') -+ self.assertEqual(response.status_code, 302) - self.assertFalse(User.objects.filter(id=user_id).exists()) - self.assertFalse(Profile.objects.filter(user_id=user_id).exists()) - self.mm_user.delete.assert_called() --- -2.41.0 - diff --git a/python-django-mailman3.spec b/python-django-mailman3.spec index f3624fd..bfa7120 100644 --- a/python-django-mailman3.spec +++ b/python-django-mailman3.spec @@ -1,15 +1,13 @@ -%global srcname django-mailman3 - -Name: python-%{srcname} -Version: 1.3.9 -Release: 4%{?dist} +Name: python-django-mailman3 +Version: 1.3.15 +Release: 1%{?dist} Summary: Django library to help interaction with Mailman + License: GPL-3.0-or-later URL: https://gitlab.com/mailman/django-mailman3 -Source0: %{pypi_source %{srcname}} -Patch0: %{srcname}-localdeps.patch -Patch1: %{srcname}-django42.diff -Patch2: django-mailman3-py312-no-assertEquals.diff +Source: %{pypi_source django_mailman3} +Patch: django-mailman3-localdeps.patch +Patch: django-mailman3-django52.patch BuildArch: noarch @@ -26,14 +24,14 @@ Django server’s settings file.} %description %{_description} -%package -n python%{python3_pkgversion}-%{srcname} +%package -n python%{python3_pkgversion}-django-mailman3 Summary: %{summary} -%description -n python%{python3_pkgversion}-%{srcname} %{_description} +%description -n python%{python3_pkgversion}-django-mailman3 %{_description} %prep -%autosetup -p1 -n %{srcname}-%{version} +%autosetup -p1 -n django_mailman3-%{version} %generate_buildrequires @@ -50,15 +48,20 @@ Summary: %{summary} %check -PYTHONPATH=.:${PYTHONPATH} %tox +PYTHONPATH=.:${PYTHONPATH} %pytest -v --deselect \ + django_mailman3/tests/test_signals.py::SignalsTestCase::test_social_account_added -%files -n python%{python3_pkgversion}-%{srcname} -f %{pyproject_files} +%files -n python%{python3_pkgversion}-django-mailman3 -f %{pyproject_files} %license COPYING.txt %doc README.rst %changelog +* Mon Nov 03 2025 bbrucezhang - 1.3.15-1 +- [Type] other +- [DESC] Update to 1.3.15 + * Wed Jun 11 2025 bbrucezhang - 1.3.9-4 - Rebuilt for loongarch64 diff --git a/sources b/sources index 7046c73..e9b16d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (django-mailman3-1.3.9.tar.gz) = dda439bc015405f1cece693afbedcd1947c63d159fb7e40b4af034192badf25eb7417a91bd0fdadc1fc55665f05ffa9d48b987bf2bd3fda6d44caf0f1b8775b2 +SHA512 (django_mailman3-1.3.15.tar.gz) = 6f349d64c93fde3ee181638afe69cf784029b20a53dc196cbdf7e82324a0258ec1737b238ebd97b1e0c125c48d3776c96f4ddc17d3e1d5eb0c43040f704c47b3 -- Gitee From c5f1f3927aae5de95f91a63693b49f9afeadbf99 Mon Sep 17 00:00:00 2001 From: bbrucezhang Date: Fri, 5 Dec 2025 17:17:21 +0800 Subject: [PATCH 2/2] small fix --- python-django-mailman3.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python-django-mailman3.spec b/python-django-mailman3.spec index bfa7120..b36ecbf 100644 --- a/python-django-mailman3.spec +++ b/python-django-mailman3.spec @@ -5,9 +5,9 @@ Summary: Django library to help interaction with Mailman License: GPL-3.0-or-later URL: https://gitlab.com/mailman/django-mailman3 -Source: %{pypi_source django_mailman3} -Patch: django-mailman3-localdeps.patch -Patch: django-mailman3-django52.patch +Source0: %{pypi_source django_mailman3} +Patch0: django-mailman3-localdeps.patch +Patch1: django-mailman3-django52.patch BuildArch: noarch -- Gitee