[arch-commits] Commit in hyperkitty/trunk (PKGBUILD hyperkitty-1.3.3-migration.patch)
David Runge
dvzrv at archlinux.org
Thu Feb 25 22:04:27 UTC 2021
Date: Thursday, February 25, 2021 @ 22:04:27
Author: dvzrv
Revision: 874209
upgpkg: hyperkitty 1.3.4-1: Upgrade to 1.3.4.
Remove upstreamed patch to fix database migration.
Modified:
hyperkitty/trunk/PKGBUILD
Deleted:
hyperkitty/trunk/hyperkitty-1.3.3-migration.patch
----------------------------------+
PKGBUILD | 19 +++---
hyperkitty-1.3.3-migration.patch | 102 -------------------------------------
2 files changed, 11 insertions(+), 110 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-02-25 22:04:04 UTC (rev 874208)
+++ PKGBUILD 2021-02-25 22:04:27 UTC (rev 874209)
@@ -2,8 +2,8 @@
_name=HyperKitty
pkgname=hyperkitty
-pkgver=1.3.3
-pkgrel=5
+pkgver=1.3.4
+pkgrel=1
pkgdesc="A web interface to access GNU Mailman v3 archives"
arch=('any')
url="https://gitlab.com/mailman/hyperkitty"
@@ -28,20 +28,26 @@
source=("https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.tar.gz"{,.asc}
"${pkgname}-1.3.2-fonts.patch"
"${pkgname}-1.3.2-settings.patch"
- "${pkgname}-1.3.3-migration.patch"
"${pkgname}-qcluster.service"
"${pkgname}.sysusers"
"${pkgname}.tmpfiles"
"${pkgname}.uwsgi")
-sha512sums=('4be4630bc0344c3e1633772978880fea996fbf2bb49b728c1d05ae13ab1df8c63b6b7b9b735df32eb2ae31798e76be537748e42c830a63aa01eeff0680f1dc76'
+sha512sums=('8cb0a24aa16b62f697d5d86c19a752b91b18ea228f9c3b3eb66fc4dce9e4fcb8560be7fbaa00000630e70aaff7c521fa7791f704854347e55d27c31dd12e733b'
'SKIP'
'27efcd1f30ab51ae61f4802bd8b06d59df09ef0807f7e92423f18390df04e0bd6f47687e191deb67e96beed8e4d5886164760b0f79d6fcb030b5624b6d7f2c6f'
'452da2c049f0c35d27e15c16af1a6a526de79a6672b6fdaf9a4bcbdfd2110ebf608e8c5a1f5dfc3bb2febc39ecc6e69e2a657c3b2c6e1d2dc2eca2de81125380'
- 'e8a90eaef5f98c0025af2dd98589e5059fd0073416c10fe17f810e8c7965a2fc724994dd2e56b034d948de032a98d41a4a3520721516dc2e573e324f4a74dff3'
'a41c938082ceee555143ddb21c3a95835f9832b9aff423142d78d3e52f12500561f80e0ce43c67a4f190065c9d045945741ac71ab3307db1419c4dc0686db09a'
'3267427109b08b8c9336b187381ed14357a07370bdcdfc24da94555020ad0424c5bbebc09e131e981e0540c51db443ffe558209e1bca7c2a1b7b1f602ed0805b'
'c943d82b8640a513728e3f07fa44c0ddb5a3bb8ec84a3a70990e51287ca01977887f895b901688fc4643d8fcb106d524259a86a51bccaafd77c69b241f1b23ba'
'351f40a6bc1fd1735c883408f9941808e081206927a7c02467e03228243dd156378cac21f851b498702bd4f96fde8e4c80536dbcc6f3c384bf708bed4e988971')
+b2sums=('d405b66115174f118f51abab22037556cd9050200723de75884fa68daf99bf5a8c46abcfe224f2ab138fbaea72d871acc7d040c4d9fcd181521b29de75575bab'
+ 'SKIP'
+ '6a82643eb7628b22c33975af5bac2cc7e6969fe0c423cd92bdd7ca1cb676a1621b0ccc089afe6d2f42aae2a6494a214bed44aa2180ee8dd8c71188e07a32ed7d'
+ '1eab6221db4adb1a066bde8d6c84a90d3e414d1d30c5cf55a90a4ac58d131f7c4872c85d65e98d91ee0f4cac6f71c47c829993c736617a86be8fec5d831422c8'
+ 'e8ae1d123e74b0c6984df3e5fff720e03dcbc3f007123718fe845024b42e5c13b7eac4da6bde04a9e1372d446bfa50ac12479730a9092e8396b73434e59663d3'
+ 'f4e912e75c5127897837d67626ba94a418ec408f0f3a9bcd1767633347e107600cc43825caa5737a84362273a353bf03097879ff5b9065663150f6db4b96238a'
+ 'e4fd83e38703d8ff9a714b238296e4e12791b8ce0c19446709e5c20b4012ed10b97504cafda66cdbe12e56a9f943c094147b6a02db3bd9c854e609adca38ff01'
+ '767f334add0dd0e83b27e198415a2ef8ae3c505aa7f37d12138e37a98dc5575e43f83eb665431464ed488a5bf6b8913cd675eb112dc880cf17ff51511a3f07e6')
validpgpkeys=('541EA0448453394FF77A0ECC9D9B2BA061D0A67C') # Abhilash Raj <raj.abhilash1 at gmail.com>
prepare() {
@@ -51,9 +57,6 @@
patch -Np1 -i "../${pkgname}-1.3.2-fonts.patch"
# setting FHS compliant default paths, remove debug options
patch -Np1 -i "../${pkgname}-1.3.2-settings.patch"
- # fix migrations for python-django >= 3.1:
- # https://gitlab.com/mailman/hyperkitty/-/issues/329
- patch -Np1 -i "../${pkgname}-1.3.3-migration.patch"
touch settings_local.py
}
Deleted: hyperkitty-1.3.3-migration.patch
===================================================================
--- hyperkitty-1.3.3-migration.patch 2021-02-25 22:04:04 UTC (rev 874208)
+++ hyperkitty-1.3.3-migration.patch 2021-02-25 22:04:27 UTC (rev 874209)
@@ -1,102 +0,0 @@
-From 0e46371f0f2aab8618aa2852ea6f63c245e16927 Mon Sep 17 00:00:00 2001
-From: David Runge <dave at sleepmap.de>
-Date: Sat, 7 Nov 2020 01:14:04 +0000
-Subject: [PATCH] Make migration compatible with django >= 3.1
-
-hyperkitty/migrations/0013_mailinglist_id_1.py:
-With django >= 3.1 the state.models.fields are represented as dicts,
-while with django < 3.1 they are represented as lists.
-Accomodate both use-cases by checking the type of the fields before
-trying to add to them.
-
-Fixes #329
----
- .gitlab-ci.yml | 50 +++++++++++--------
- .../migrations/0013_mailinglist_id_1.py | 33 ++++++++++--
- setup.py | 2 +-
- tox.ini | 5 +-
- 4 files changed, 62 insertions(+), 28 deletions(-)
-
-diff --git a/hyperkitty/migrations/0013_mailinglist_id_1.py b/hyperkitty/migrations/0013_mailinglist_id_1.py
-index f460daf9..d55afed5 100644
---- a/hyperkitty/migrations/0013_mailinglist_id_1.py
-+++ b/hyperkitty/migrations/0013_mailinglist_id_1.py
-@@ -16,10 +16,35 @@ class MailingListPrimaryKey(migrations.AlterField):
- )
-
- def state_forwards(self, app_label, state):
-- state.models[app_label, self.model_name_lower].fields.insert(0, (
-- "id", models.AutoField(
-- name="id", auto_created=True, primary_key=True, serialize=False,
-- verbose_name='ID')))
-+ # django < 3.1
-+ if type(state.models[app_label, self.model_name_lower].fields) is list:
-+ state.models[app_label, self.model_name_lower].fields.insert(
-+ 0,
-+ (
-+ "id",
-+ models.AutoField(
-+ name="id",
-+ auto_created=True,
-+ primary_key=True,
-+ serialize=False,
-+ verbose_name='ID'
-+ )
-+ )
-+ )
-+ # django >= 3.1
-+ else:
-+ state.models[app_label, self.model_name_lower].fields.update(
-+ {
-+ "id":
-+ models.AutoField(
-+ name="id",
-+ auto_created=True,
-+ primary_key=True,
-+ serialize=False,
-+ verbose_name='ID',
-+ )
-+ }
-+ )
- super(MailingListPrimaryKey, self).state_forwards(app_label, state)
-
- def database_forwards(self, app_label, schema_editor, from_state, to_state):
-diff --git a/setup.py b/setup.py
-index cb058659..0968c676 100755
---- a/setup.py
-+++ b/setup.py
-@@ -37,7 +37,7 @@ with open('hyperkitty/__init__.py') as fp:
-
- # Requirements
- REQUIRES = [
-- "Django>=2.0,<3.1",
-+ "Django>=2.2,<3.2",
- "django_mailman3>=1.3.3",
- "django-gravatar2>=1.0.6",
- "djangorestframework>=3.0.0",
-diff --git a/tox.ini b/tox.ini
-index 7fdc43f8..3dd6487d 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -1,5 +1,5 @@
- [tox]
--envlist = py{36,37,38}-django{20,21,22,30},docs,lint
-+envlist = py{36,37,38,39}-django{22,30,31},docs,lint
-
-
- [testenv]
-@@ -16,10 +16,9 @@ deps =
- head: git+https://gitlab.com/mailman/mailmanclient.git
- dev: -e../mailmanclient
- dev: -e../django-mailman3
-- django20: Django>=2.0,<2.1
-- django21: Django>=2.1,<2.2
- django22: Django>=2.2,<2.3
- django30: Django>=3.0,<3.1
-+ django31: Django>=3.1,<3.2
- django30,coverage: django-haystack>=3.0b2
- commands =
- coverage run example_project/manage.py test --settings=hyperkitty.tests.settings_test {posargs:hyperkitty}
---
-GitLab
-
More information about the arch-commits
mailing list