forked from pool/python-postorius
Accepting request 1037267 from devel:languages:python:mailman
OBS-URL: https://build.opensuse.org/request/show/1037267 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-postorius?expand=0&rev=2
This commit is contained in:
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:2b0cc453d21f710e983d9bb78cfb85addeaec7fddeda9ce82df4eb6a4fda1a68
|
|
||||||
size 3086923
|
|
3
postorius-1.3.7.tar.gz
Normal file
3
postorius-1.3.7.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:3d40a9d025bfdec0fdeb5d320ed2db3fbbffc77bd0dfeb619f39cf345c03a2f0
|
||||||
|
size 3197409
|
@@ -1,83 +0,0 @@
|
|||||||
From db2bd36a76f21d0637b5b7894f564918161c3185 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Runge <dave@sleepmap.de>
|
|
||||||
Date: Sun, 20 Feb 2022 18:20:27 +0000
|
|
||||||
Subject: [PATCH] Make compatible with django 4.0
|
|
||||||
|
|
||||||
---
|
|
||||||
.gitlab-ci.yml | 14 ++++++++++++--
|
|
||||||
setup.py | 2 +-
|
|
||||||
src/postorius/doc/news.rst | 1 +
|
|
||||||
src/postorius/forms/fields.py | 11 +++++++++--
|
|
||||||
tox.ini | 5 +++--
|
|
||||||
5 files changed, 26 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
Index: postorius-1.3.6/setup.py
|
|
||||||
===================================================================
|
|
||||||
--- postorius-1.3.6.orig/setup.py 2022-02-21 08:32:54.275160495 +0100
|
|
||||||
+++ postorius-1.3.6/setup.py 2022-02-21 08:32:56.591175549 +0100
|
|
||||||
@@ -54,7 +54,7 @@ setup(
|
|
||||||
include_package_data=True,
|
|
||||||
install_requires=[
|
|
||||||
'django-mailman3>=1.3.7',
|
|
||||||
- 'django>=2.2,<3.3',
|
|
||||||
+ 'django>=2.2,<4.1',
|
|
||||||
'mailmanclient>=3.3.3',
|
|
||||||
'readme_renderer[md]',
|
|
||||||
],
|
|
||||||
Index: postorius-1.3.6/src/postorius/forms/fields.py
|
|
||||||
===================================================================
|
|
||||||
--- postorius-1.3.6.orig/src/postorius/forms/fields.py 2022-02-21 08:32:54.275160495 +0100
|
|
||||||
+++ postorius-1.3.6/src/postorius/forms/fields.py 2022-02-21 08:32:56.591175549 +0100
|
|
||||||
@@ -19,7 +19,14 @@
|
|
||||||
|
|
||||||
|
|
||||||
from django import forms
|
|
||||||
-from django.utils.encoding import smart_text
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+try:
|
|
||||||
+ from django.utils.encoding import smart_str
|
|
||||||
+except ImportError:
|
|
||||||
+ # django < 4.0
|
|
||||||
+ from django.utils.encoding import smart_text as smart_str
|
|
||||||
+
|
|
||||||
from django.utils.translation import gettext_lazy as _
|
|
||||||
|
|
||||||
from postorius.utils import with_empty_choice
|
|
||||||
@@ -62,7 +69,7 @@ class ListOfStringsField(forms.Field):
|
|
||||||
line = line.strip()
|
|
||||||
if not line:
|
|
||||||
continue
|
|
||||||
- result.append(smart_text(line))
|
|
||||||
+ result.append(smart_str(line))
|
|
||||||
return result
|
|
||||||
|
|
||||||
|
|
||||||
Index: postorius-1.3.6/tox.ini
|
|
||||||
===================================================================
|
|
||||||
--- postorius-1.3.6.orig/tox.ini 2022-02-21 08:32:54.275160495 +0100
|
|
||||||
+++ postorius-1.3.6/tox.ini 2022-02-21 08:32:56.591175549 +0100
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
[tox]
|
|
||||||
-envlist = py{36,37,38,39}-django{22,31,32,-latest},qa
|
|
||||||
+envlist = py{36,37,38,39,310}-django{22,31,32,-latest},qa
|
|
||||||
|
|
||||||
[testenv]
|
|
||||||
usedevelop = True
|
|
||||||
@@ -19,6 +19,7 @@ deps =
|
|
||||||
django30: Django>=3.0,<3.1
|
|
||||||
django31: Django>=3.1,<3.2
|
|
||||||
django32: Django>=3.2,<3.3
|
|
||||||
+ django40: Django>=4.0,<4.1
|
|
||||||
django-latest: https://github.com/django/django/archive/main.tar.gz
|
|
||||||
commands =
|
|
||||||
pytest {posargs:../src}
|
|
||||||
@@ -30,7 +31,7 @@ setenv =
|
|
||||||
basepython = python3
|
|
||||||
deps =
|
|
||||||
{[testenv]deps}
|
|
||||||
- Django>=3.2,<3.3
|
|
||||||
+ Django>=3.2,<4.1
|
|
||||||
coverage
|
|
||||||
commands =
|
|
||||||
coverage run -m pytest {posargs:../src/postorius}
|
|
@@ -1,8 +1,8 @@
|
|||||||
Index: postorius-1.3.6/example_project/settings.py
|
Index: postorius-1.3.7/example_project/settings.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- postorius-1.3.6.orig/example_project/settings.py 2021-09-19 03:21:45.000000000 +0200
|
--- postorius-1.3.7.orig/example_project/settings.py 2022-10-22 07:10:31.000000000 +0200
|
||||||
+++ postorius-1.3.6/example_project/settings.py 2021-11-18 08:48:27.881938336 +0100
|
+++ postorius-1.3.7/example_project/settings.py 2022-11-17 16:05:22.163232646 +0100
|
||||||
@@ -136,7 +136,7 @@ WSGI_APPLICATION = 'wsgi.application'
|
@@ -142,7 +142,7 @@ WSGI_APPLICATION = 'wsgi.application'
|
||||||
DATABASES = {
|
DATABASES = {
|
||||||
'default': {
|
'default': {
|
||||||
'ENGINE': 'django.db.backends.sqlite3',
|
'ENGINE': 'django.db.backends.sqlite3',
|
||||||
@@ -11,7 +11,7 @@ Index: postorius-1.3.6/example_project/settings.py
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -180,7 +180,7 @@ USE_TZ = True
|
@@ -190,7 +190,7 @@ USE_TZ = True
|
||||||
# Don't put anything in this directory yourself; store your static files
|
# Don't put anything in this directory yourself; store your static files
|
||||||
# in apps' "static/" subdirectories and in STATICFILES_DIRS.
|
# in apps' "static/" subdirectories and in STATICFILES_DIRS.
|
||||||
# Example: "/var/www/example.com/static/"
|
# Example: "/var/www/example.com/static/"
|
||||||
@@ -20,7 +20,7 @@ Index: postorius-1.3.6/example_project/settings.py
|
|||||||
|
|
||||||
# URL prefix for static files.
|
# URL prefix for static files.
|
||||||
# Example: "http://example.com/static/", "http://static.example.com/"
|
# Example: "http://example.com/static/", "http://static.example.com/"
|
||||||
@@ -259,7 +259,7 @@ LOGGING = {
|
@@ -269,7 +269,7 @@ LOGGING = {
|
||||||
'level': 'INFO',
|
'level': 'INFO',
|
||||||
#'class': 'logging.handlers.RotatingFileHandler',
|
#'class': 'logging.handlers.RotatingFileHandler',
|
||||||
'class': 'logging.handlers.WatchedFileHandler',
|
'class': 'logging.handlers.WatchedFileHandler',
|
||||||
|
@@ -1,3 +1,33 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Nov 17 15:07:07 UTC 2022 - Andreas Schneider <asn@cryptomilk.org>
|
||||||
|
|
||||||
|
- Update to version 1.3.7
|
||||||
|
* Fix a bug where various form(s) allowed setting empty values for
|
||||||
|
delivery_mode and language. (Fixes #540, #522)
|
||||||
|
* Rename labels description and info fields as 'Short Description' and 'Long
|
||||||
|
Description' to signify what they mean. (Fixes #510)
|
||||||
|
* Use date to format the dates in 'List Metrics' section in the List summary
|
||||||
|
page. (Fixes #508)
|
||||||
|
* Sort the list of languages in all Select elements alphabetically so they
|
||||||
|
are easier to naviate with screen readers. (Fixes #498)
|
||||||
|
* Add support for Django 4.0
|
||||||
|
* A couple of unit tests are now marked expectedFailure due to
|
||||||
|
https://gitlab.com/mailman/mailman/-/merge_requests/997. (See #548)
|
||||||
|
* Translate template names in the “New Templates” page (See #547)
|
||||||
|
* Translate the section names in the MailingList->"Settings" tab. (See #550)
|
||||||
|
* Add support for Django 4.1
|
||||||
|
* Add support for Python 3.10
|
||||||
|
* Remove support for Django < 3.2
|
||||||
|
* Remove support for Python < 3.7
|
||||||
|
* Replace the use of mock with unittest.mock
|
||||||
|
* Change the way role is selector in the List index page to allow use of the
|
||||||
|
* filtering without javascript enabled dropdowns. It also enhances usability
|
||||||
|
by enabling the roles that are currently active by default. (See #544)
|
||||||
|
* Show the number of files in each Mailman queue under 'System Information'
|
||||||
|
tab for Admins. (Fixes #480)
|
||||||
|
- Removed postorius-fix-django-4.0-compatibility.patch
|
||||||
|
- Add BR for django debug toolbar
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jul 6 14:30:03 UTC 2022 - Andreas Schneider <asn@cryptomilk.org>
|
Wed Jul 6 14:30:03 UTC 2022 - Andreas Schneider <asn@cryptomilk.org>
|
||||||
|
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package python-postorius
|
# spec file for package python-postorius
|
||||||
#
|
#
|
||||||
# Copyright (c) 2021 SUSE LLC
|
# Copyright (c) 2022 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: python-postorius
|
Name: python-postorius
|
||||||
Version: 1.3.6
|
Version: 1.3.7
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: A web user interface for GNU Mailman
|
Summary: A web user interface for GNU Mailman
|
||||||
License: GPL-3.0-only
|
License: GPL-3.0-only
|
||||||
@@ -59,9 +59,6 @@ Source12: postorius.uwsgi
|
|||||||
Source20: README.SUSE.md
|
Source20: README.SUSE.md
|
||||||
#
|
#
|
||||||
Patch0: postorius-settings.patch
|
Patch0: postorius-settings.patch
|
||||||
# Make compatible with django 4.0
|
|
||||||
# https://gitlab.com/mailman/postorius/-/commit/db2bd36a76f21d0637b5b7894f564918161c3185
|
|
||||||
Patch1: postorius-fix-django-4.0-compatibility.patch
|
|
||||||
#
|
#
|
||||||
BuildRequires: %{python_module devel}
|
BuildRequires: %{python_module devel}
|
||||||
BuildRequires: %{python_module setuptools}
|
BuildRequires: %{python_module setuptools}
|
||||||
@@ -81,7 +78,9 @@ BuildRequires: mailman3 >= 3.3.5
|
|||||||
BuildRequires: %{python_module Django >= 2.2}
|
BuildRequires: %{python_module Django >= 2.2}
|
||||||
BuildRequires: %{python_module beautifulsoup4}
|
BuildRequires: %{python_module beautifulsoup4}
|
||||||
BuildRequires: %{python_module cmarkgfm}
|
BuildRequires: %{python_module cmarkgfm}
|
||||||
|
BuildRequires: %{python_module django-debug-toolbar >= 2.2}
|
||||||
BuildRequires: %{python_module django-mailman3 >= 1.3.7}
|
BuildRequires: %{python_module django-mailman3 >= 1.3.7}
|
||||||
|
BuildRequires: %{python_module django-requests-debug-toolbar >= 0.0.3}
|
||||||
BuildRequires: %{python_module isort}
|
BuildRequires: %{python_module isort}
|
||||||
BuildRequires: %{python_module mailmanclient >= 3.3.3}
|
BuildRequires: %{python_module mailmanclient >= 3.3.3}
|
||||||
BuildRequires: %{python_module pytest-django}
|
BuildRequires: %{python_module pytest-django}
|
||||||
@@ -97,7 +96,9 @@ A web user interface for GNU Mailman
|
|||||||
%package -n %{postorius_pkgname}
|
%package -n %{postorius_pkgname}
|
||||||
Summary: A web user interface for GNU Mailman
|
Summary: A web user interface for GNU Mailman
|
||||||
Requires: %{mypython}-Django >= 1.11
|
Requires: %{mypython}-Django >= 1.11
|
||||||
|
Requires: %{mypython}-django-debug-toolbar >= 2.2.0
|
||||||
Requires: %{mypython}-django-mailman3 >= 1.3.7
|
Requires: %{mypython}-django-mailman3 >= 1.3.7
|
||||||
|
Requires: %{mypython}-django-requests-debug-toolbar >= 0.0.3
|
||||||
Requires: %{mypython}-mailmanclient >= 3.3.2
|
Requires: %{mypython}-mailmanclient >= 3.3.2
|
||||||
Requires: %{mypython}-readme_renderer
|
Requires: %{mypython}-readme_renderer
|
||||||
%if "%{expand:%%%{mypython}_provides}" == "python3"
|
%if "%{expand:%%%{mypython}_provides}" == "python3"
|
||||||
@@ -112,9 +113,9 @@ A web user interface for GNU Mailman
|
|||||||
|
|
||||||
%package -n %{postorius_pkgname}-web
|
%package -n %{postorius_pkgname}-web
|
||||||
Summary: The webroot for GNU Mailman
|
Summary: The webroot for GNU Mailman
|
||||||
|
Requires: %{postorius_pkgname}
|
||||||
Requires: acl
|
Requires: acl
|
||||||
Requires: openssl
|
Requires: openssl
|
||||||
Requires: %{postorius_pkgname}
|
|
||||||
Requires: sudo
|
Requires: sudo
|
||||||
|
|
||||||
%description -n %{postorius_pkgname}-web
|
%description -n %{postorius_pkgname}-web
|
||||||
@@ -199,14 +200,12 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/uwsgi/vassals
|
|||||||
install -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/uwsgi/vassals/postorius.ini
|
install -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/uwsgi/vassals/postorius.ini
|
||||||
|
|
||||||
%check
|
%check
|
||||||
pushd example_project
|
export PYTHONPATH="$(pwd):$(pwd)/src"
|
||||||
export PYTHONPATH='../src'
|
|
||||||
export LANG=C.UTF-8
|
export LANG=C.UTF-8
|
||||||
%pytest ..
|
%pytest
|
||||||
# clean flavored alternatives created by test setup, because we are going to install the example_project as docs
|
# clean flavored alternatives created by test setup, because we are going to install the example_project as docs
|
||||||
rm -rf build/flavorbin
|
rm -rf build/flavorbin
|
||||||
rm -rf build/xdgflavorconfig
|
rm -rf build/xdgflavorconfig
|
||||||
popd
|
|
||||||
|
|
||||||
%pre -n %{postorius_pkgname}-web
|
%pre -n %{postorius_pkgname}-web
|
||||||
/usr/sbin/groupadd -r postorius &>/dev/null || :
|
/usr/sbin/groupadd -r postorius &>/dev/null || :
|
||||||
@@ -246,6 +245,7 @@ fi
|
|||||||
%{postorius_basedir}/static/admin
|
%{postorius_basedir}/static/admin
|
||||||
%{postorius_basedir}/static/django-mailman3
|
%{postorius_basedir}/static/django-mailman3
|
||||||
%{postorius_basedir}/static/postorius
|
%{postorius_basedir}/static/postorius
|
||||||
|
%{postorius_basedir}/static/debug_toolbar
|
||||||
|
|
||||||
%attr(750,root,postorius) %dir %{postorius_etcdir}
|
%attr(750,root,postorius) %dir %{postorius_etcdir}
|
||||||
%attr(640,root,postorius) %config(noreplace) %{postorius_etcdir}/settings_local.py
|
%attr(640,root,postorius) %config(noreplace) %{postorius_etcdir}/settings_local.py
|
||||||
|
Reference in New Issue
Block a user