Date: Sunday, February 20, 2022 @ 15:05:58 Author: dvzrv Revision: 1135284
upgpkg: python-django-mailman3 1.3.7-4: Rebuild for django 4.0 compatibility. Add upstream patch for django 4.0 compatibility: https://gitlab.com/mailman/django-mailman3/-/merge_requests/150 Remove unneeded quotes and curly braces. Added: python-django-mailman3/trunk/python-django-mailman3-1.3.7-django4.0.patch Modified: python-django-mailman3/trunk/PKGBUILD ----------------------------------------------+ PKGBUILD | 42 +++++++++------- python-django-mailman3-1.3.7-django4.0.patch | 63 +++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 18 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-02-20 14:22:54 UTC (rev 1135283) +++ PKGBUILD 2022-02-20 15:05:58 UTC (rev 1135284) @@ -3,39 +3,45 @@ _name=django-mailman3 pkgname=python-django-mailman3 pkgver=1.3.7 -pkgrel=3 +pkgrel=4 pkgdesc="Libraries and templates to Django-based interfaces interacting with Mailman" -arch=('any') +arch=(any) url="https://gitlab.com/mailman/django-mailman3" -license=('GPL3') -depends=('python-django' 'python-django-allauth' 'python-django-gravatar' -'python-mailmanclient' 'python-pytz') -makedepends=('python-setuptools') -checkdepends=('python-coverage' 'python-mock' 'python-pytest') -source=("https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.tar.gz"{,.asc}) +license=(GPL3) +depends=(python-django python-django-allauth python-django-gravatar +python-mailmanclient python-pytz) +makedepends=(python-setuptools) +checkdepends=(python-coverage python-mock python-pytest) +source=( + https://files.pythonhosted.org/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz{,.asc} + $pkgname-1.3.7-django4.0.patch +) sha512sums=('923ca67cc813f59ee9e84b639c4a0b2cfe5b39b63a1a19c5b28c7727540a0ca1f1ee9ecfa12d91a314ee3d7cdb3535c939b9a240281ba277b9af276f18be28e8' - 'SKIP') + 'SKIP' + '668a6f3365b3ed88f38c5da4b511f2986281d514e675f685642a6708be2f03fb8ce3f6badb695ca1a5537088be96af6bad6b8297944b1fb27dfad9284abd707a') b2sums=('cabaabd9514b28caf571af56b966b37893d582b3fc61b945096dd4b898635b321b239d88082c496f9b972a42bd773354e081e397418bc07c219596e7f9e0edda' - 'SKIP') + 'SKIP' + 'bfd5d7cd0d2522ad4beefa8c66d2a733c677292dc3627425d12bbdbfe2830573673bdef0640cab74e63644660b604c21bf4650200d41ad3d7851f47ddd598a15') validpgpkeys=('541EA0448453394FF77A0ECC9D9B2BA061D0A67C') # Abhilash Raj <raj.abhila...@gmail.com> prepare() { - mv -v "${_name}-${pkgver}" "$pkgname-$pkgver" + # fix for django 4.0: https://gitlab.com/mailman/django-mailman3/-/merge_requests/150 + patch -d $_name-$pkgver -p1 -i ../$pkgname-1.3.7-django4.0.patch } build() { - cd "$pkgname-$pkgver" + cd $_name-$pkgver python setup.py build } check() { - cd "$pkgname-$pkgver" - export PYTHONPATH="build:${PYTHONPATH}" - django-admin.py test --settings=django_mailman3.tests.settings_test django_mailman3 + cd $_name-$pkgver + export PYTHONPATH="build:$PYTHONPATH" + django-admin test --settings=django_mailman3.tests.settings_test django_mailman3 } package() { - cd "$pkgname-$pkgver" - python setup.py install --optimize=1 --root="${pkgdir}" - install -vDm 644 README.rst -t "${pkgdir}/usr/share/doc/${pkgname}" + cd $_name-$pkgver + python setup.py install --optimize=1 --root="$pkgdir" + install -vDm 644 README.rst -t "$pkgdir/usr/share/doc/$pkgname" } Added: python-django-mailman3-1.3.7-django4.0.patch =================================================================== --- python-django-mailman3-1.3.7-django4.0.patch (rev 0) +++ python-django-mailman3-1.3.7-django4.0.patch 2022-02-20 15:05:58 UTC (rev 1135284) @@ -0,0 +1,63 @@ +From ef3e835125ab53157b45dbd6e95a5b104a3d4610 Mon Sep 17 00:00:00 2001 +From: John Vandenberg <jay...@gmail.com> +Date: Mon, 27 Dec 2021 06:33:03 +0800 +Subject: [PATCH 2/4] setup.py: Allow Django 4.0 + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 51f3600..c6c27e4 100755 +--- a/setup.py ++++ b/setup.py +@@ -38,7 +38,7 @@ setup( + packages=find_packages(), + include_package_data=True, + install_requires=[ +- 'django>=2.2,<3.3', ++ 'django>=2.2,<4.1', + 'mailmanclient>=3.3.3', + 'django-allauth', + 'django-gravatar2 >= 1.0.6', +-- +GitLab + + +From 6cfc4c87bc445592a1a020ee877bd8fead3d8e39 Mon Sep 17 00:00:00 2001 +From: John Vandenberg <jay...@gmail.com> +Date: Mon, 27 Dec 2021 06:33:03 +0800 +Subject: [PATCH 3/4] signals.py: Fix Django 4.0 breakage + +--- + django_mailman3/signals.py | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/django_mailman3/signals.py b/django_mailman3/signals.py +index 54306eb..20f1b11 100644 +--- a/django_mailman3/signals.py ++++ b/django_mailman3/signals.py +@@ -51,13 +51,13 @@ FIELD_LAST_NAME = 'last_name' + # + # Defined signals + # +-domain_created = Signal(providing_args=["mail_host"]) +-domain_deleted = Signal(providing_args=["mail_host"]) +-mailinglist_created = Signal(providing_args=["list_id"]) +-mailinglist_modified = Signal(providing_args=["list_id"]) +-mailinglist_deleted = Signal(providing_args=["list_id", "delete_archives"]) +-user_subscribed = Signal(providing_args=["list_id", "user_email", "role"]) +-user_unsubscribed = Signal(providing_args=["list_id", "user_email", "role"]) ++domain_created = Signal() ++domain_deleted = Signal() ++mailinglist_created = Signal() ++mailinglist_modified = Signal() ++mailinglist_deleted = Signal() ++user_subscribed = Signal() ++user_unsubscribed = Signal() + + # + # Signals listened to +-- +GitLab +