Jelle van der Waa pushed to branch main at Arch Linux / Packaging / Packages / 
python-django-mailman3


Commits:
a24e09f0 by Jelle van der Waa at 2024-09-09T20:49:34+02:00
upgpkg: 1.3.15-1: django 5.1 rebuild

- - - - -
8f2f96c2 by Jelle van der Waa at 2024-09-09T20:50:40+02:00
upgpkg: 1.3.15-2: django 5.1 rebuild

- - - - -


4 changed files:

- .SRCINFO
- PKGBUILD
- + bump-django-version.patch
- + hack-incompatible-allauth-test.patch


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = python-django-mailman3
        pkgdesc = Libraries and templates to Django-based interfaces 
interacting with Mailman
        pkgver = 1.3.15
-       pkgrel = 1
+       pkgrel = 2
        url = https://gitlab.com/mailman/django-mailman3
        arch = any
        license = GPL-3.0-or-later
@@ -18,8 +18,14 @@ pkgbase = python-django-mailman3
        depends = python-mailmanclient
        depends = python-openid
        source = 
git+https://gitlab.com/mailman/django-mailman3?signed#tag=v1.3.15
+       source = hack-incompatible-allauth-test.patch
+       source = bump-django-version.patch
        validpgpkeys = 541EA0448453394FF77A0ECC9D9B2BA061D0A67C
        sha512sums = 
cfe2cbdc254ba089962969f6f57e4c8761ea60ed491930789260e24aff22d864cd41b774c13924df29d295a8ab5d4f929a4c23928cd927ad40054d376882794c
+       sha512sums = 
87d102617a0d8bae603c925074b132abdb4cdd75b062a75776242ea0e49aba878440492a4b8d755a445e648e36c2ebedb79cd4d8ecbc98fa66bd3fa5cd38b4c2
+       sha512sums = 
33cb9db08bc8eff0110909fd161da4cdcfeb74d1cf1f565043877bc483a5bb22b903b4e00de95df5843e1721fc6ab77999c82a73b6baa8075bcf5c0b62be6c2a
        b2sums = 
320812e7d597fa5616305a6d868a75f22819ca2050defa0572eea5ec687cd862628f88a97d27270e594de270e4c385ff69bdcaf00634d455d22c4f1315eee6e5
+       b2sums = 
37dc4c1371b61aa95de997409554a91cb2e31b0a6928457c1c62cdd1ef0af65438908faa86de66f07d4c35851101bf96cfa82c8b549ab8407ec668b1f7507d62
+       b2sums = 
8a0600c76e46bd74232fc099c2ab4a51e1ee3fbcece8393120c4d20d49c0507e75221de6d53cbe68cdc5e5f53900a5572ac299657cfaf857b8f9f38acbc0c8bb
 
 pkgname = python-django-mailman3


=====================================
PKGBUILD
=====================================
@@ -3,7 +3,7 @@
 _name=django-mailman3
 pkgname=python-django-mailman3
 pkgver=1.3.15
-pkgrel=1
+pkgrel=2
 pkgdesc="Libraries and templates to Django-based interfaces interacting with 
Mailman"
 arch=(any)
 url="https://gitlab.com/mailman/django-mailman3";
@@ -26,9 +26,15 @@ makedepends=(
 checkdepends=(python-pytest)
 source=(
   "git+$url?signed#tag=v$pkgver"
+  "hack-incompatible-allauth-test.patch"
+  "bump-django-version.patch"
 )
-sha512sums=('cfe2cbdc254ba089962969f6f57e4c8761ea60ed491930789260e24aff22d864cd41b774c13924df29d295a8ab5d4f929a4c23928cd927ad40054d376882794c')
-b2sums=('320812e7d597fa5616305a6d868a75f22819ca2050defa0572eea5ec687cd862628f88a97d27270e594de270e4c385ff69bdcaf00634d455d22c4f1315eee6e5')
+sha512sums=('cfe2cbdc254ba089962969f6f57e4c8761ea60ed491930789260e24aff22d864cd41b774c13924df29d295a8ab5d4f929a4c23928cd927ad40054d376882794c'
+            
'87d102617a0d8bae603c925074b132abdb4cdd75b062a75776242ea0e49aba878440492a4b8d755a445e648e36c2ebedb79cd4d8ecbc98fa66bd3fa5cd38b4c2'
+            
'33cb9db08bc8eff0110909fd161da4cdcfeb74d1cf1f565043877bc483a5bb22b903b4e00de95df5843e1721fc6ab77999c82a73b6baa8075bcf5c0b62be6c2a')
+b2sums=('320812e7d597fa5616305a6d868a75f22819ca2050defa0572eea5ec687cd862628f88a97d27270e594de270e4c385ff69bdcaf00634d455d22c4f1315eee6e5'
+        
'37dc4c1371b61aa95de997409554a91cb2e31b0a6928457c1c62cdd1ef0af65438908faa86de66f07d4c35851101bf96cfa82c8b549ab8407ec668b1f7507d62'
+        
'8a0600c76e46bd74232fc099c2ab4a51e1ee3fbcece8393120c4d20d49c0507e75221de6d53cbe68cdc5e5f53900a5572ac299657cfaf857b8f9f38acbc0c8bb')
 validpgpkeys=('541EA0448453394FF77A0ECC9D9B2BA061D0A67C') # Abhilash Raj 
<[email protected]>
 
 pkgver() {
@@ -36,6 +42,16 @@ pkgver() {
   git describe | sed 's/\([^-]*-g\)/r\1/;s/v//g;s/-/./g'
 }
 
+prepare() {
+  cd $_name/django_mailman3/
+  # https://gitlab.com/mailman/django-mailman3/-/issues/82
+  patch -Np1 -i ${srcdir}/hack-incompatible-allauth-test.patch
+
+  # Bump django version to 5.1
+  cd $srcdir/$_name
+  patch -Np0 -i ${srcdir}/bump-django-version.patch
+}
+
 build() {
   cd $_name
   python -m build --wheel --no-isolation


=====================================
bump-django-version.patch
=====================================
@@ -0,0 +1,11 @@
+--- pyproject.toml.old 2024-09-09 20:45:46.248825981 +0200
++++ pyproject.toml     2024-09-09 20:45:53.712342492 +0200
+@@ -18,7 +18,7 @@
+ dependencies = [
+     "django-allauth[socialaccount,openid]>=0.63",
+     "django-gravatar2 >= 1.0.6",
+-    "django>=4.2,<5.1",
++    "django>=4.2,<5.2",
+     "mailmanclient>=3.3.3",
+ ]
+ license = {text = "GPLv3"}


=====================================
hack-incompatible-allauth-test.patch
=====================================
@@ -0,0 +1,12 @@
+diff -aur django_mailman3.old/tests/test_signals.py 
django_mailman3/tests/test_signals.py
+--- django_mailman3.old/tests/test_signals.py  2024-09-09 20:24:30.962861453 
+0200
++++ django_mailman3/tests/test_signals.py      2024-09-09 20:25:19.100319986 
+0200
+@@ -96,7 +96,7 @@
+         unverified = EmailAddress(
+             email='[email protected]', verified=False)
+         sociallogin = SocialLogin(
+-            user=self.user, email_addresses=[verified, unverified])
++            user=self.user, email_addresses=[verified, unverified], 
account=True)
+         with patch('django_mailman3.signals.add_address_to_mailman_user') \
+                 as aatmu:
+             social_account_added.send(sender=User, sociallogin=sociallogin)



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/python-django-mailman3/-/compare/6d233dc1625673d707538a284cffc1b69b0ed621...8f2f96c250f8e18f2d289c7fa714c9b77d8f01d4

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/python-django-mailman3/-/compare/6d233dc1625673d707538a284cffc1b69b0ed621...8f2f96c250f8e18f2d289c7fa714c9b77d8f01d4
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to