Date: Thursday, October 20, 2022 @ 18:36:10 Author: dvzrv Revision: 1333001
upgpkg: python-django-mailman3 1.3.7.r96.gbf4b154-1: Update to current HEAD. Upstream has not done any release in a long time, even after providing them with fixes for django 4.0 and django 4.1 and contacting them about this multiple times. Backporting patches has become extremely cumbersome, as they do not cleanly apply on top of the source tarball (e.g. setuptools seems to change setup.py). So we are permanently switching to git sources and do not bother with backporting up to 30% of the nearly 100 commits on top of 1.3.7 for our own sanity. Remove all now included (backported) patches. Switch to PEP517. Remove tests from package files. Modified: python-django-mailman3/trunk/PKGBUILD Deleted: python-django-mailman3/trunk/python-django-mailman3-1.3.7-django4.0.patch ----------------------------------------------+ PKGBUILD | 43 ++++++++--------- python-django-mailman3-1.3.7-django4.0.patch | 63 ------------------------- 2 files changed, 21 insertions(+), 85 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-10-20 18:33:48 UTC (rev 1333000) +++ PKGBUILD 2022-10-20 18:36:10 UTC (rev 1333001) @@ -2,8 +2,9 @@ _name=django-mailman3 pkgname=python-django-mailman3 -pkgver=1.3.7 -pkgrel=4 +pkgver=1.3.7.r96.gbf4b154 +_commit=bf4b154f04e894dfc60ca58a8de321657a9759e1 # somewhere on master post 1.3.7 +pkgrel=1 pkgdesc="Libraries and templates to Django-based interfaces interacting with Mailman" arch=(any) url="https://gitlab.com/mailman/django-mailman3"; @@ -10,38 +11,36 @@ 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' - '668a6f3365b3ed88f38c5da4b511f2986281d514e675f685642a6708be2f03fb8ce3f6badb695ca1a5537088be96af6bad6b8297944b1fb27dfad9284abd707a') -b2sums=('cabaabd9514b28caf571af56b966b37893d582b3fc61b945096dd4b898635b321b239d88082c496f9b972a42bd773354e081e397418bc07c219596e7f9e0edda' - 'SKIP' - 'bfd5d7cd0d2522ad4beefa8c66d2a733c677292dc3627425d12bbdbfe2830573673bdef0640cab74e63644660b604c21bf4650200d41ad3d7851f47ddd598a15') +makedepends=(git python-build python-installer python-setuptools python-wheel) +checkdepends=(python-pytest) +source=(git+https://gitlab.com/mailman/django-mailman3#commit=$_commit) +sha512sums=('SKIP') +b2sums=('SKIP') validpgpkeys=('541EA0448453394FF77A0ECC9D9B2BA061D0A67C') # Abhilash Raj <[email protected]> -prepare() { - # 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 +pkgver() { + cd $_name + git describe --long | sed 's/\([^-]*-g\)/r\1/;s/v//g;s/-/./g' } build() { - cd $_name-$pkgver - python setup.py build + cd $_name + python -m build --wheel --no-isolation } check() { - cd $_name-$pkgver + cd $_name export PYTHONPATH="build:$PYTHONPATH" django-admin test --settings=django_mailman3.tests.settings_test django_mailman3 } package() { - cd $_name-$pkgver - python setup.py install --optimize=1 --root="$pkgdir" + local site_packages=$(python -c "import site; print(site.getsitepackages()[0])") + + cd $_name + python -m installer --destdir="$pkgdir" dist/*.whl + # remove tests + rm -frv "$pkgdir/$site_packages/django_mailman3/tests/" + install -vDm 644 README.rst -t "$pkgdir/usr/share/doc/$pkgname" } Deleted: python-django-mailman3-1.3.7-django4.0.patch =================================================================== --- python-django-mailman3-1.3.7-django4.0.patch 2022-10-20 18:33:48 UTC (rev 1333000) +++ python-django-mailman3-1.3.7-django4.0.patch 2022-10-20 18:36:10 UTC (rev 1333001) @@ -1,63 +0,0 @@ -From ef3e835125ab53157b45dbd6e95a5b104a3d4610 Mon Sep 17 00:00:00 2001 -From: John Vandenberg <[email protected]> -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 <[email protected]> -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 -
