Accepting request 1037046 from devel:languages:python:mailman:backports

Fix the build and tests.

OBS-URL: https://build.opensuse.org/request/show/1037046
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:mailman/python-postorius?expand=0&rev=43

postorius-fix-django-4.0-compatibility.patch

@@ -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}

python-postorius.changes

@@ -25,6 +25,8 @@ Thu Nov 17 15:07:07 UTC 2022 - Andreas Schneider <asn@cryptomilk.org>
      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>

python-postorius.spec

@@ -59,9 +59,6 @@ Source12:       postorius.uwsgi
 Source20:       README.SUSE.md
 #
 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 setuptools}
@@ -81,7 +78,9 @@ BuildRequires:  mailman3 >= 3.3.5
 BuildRequires:  %{python_module Django >= 2.2}
 BuildRequires:  %{python_module beautifulsoup4}
 BuildRequires:  %{python_module cmarkgfm}
+BuildRequires:  %{python_module django-debug-toolbar >= 2.2}
 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 mailmanclient >= 3.3.3}
 BuildRequires:  %{python_module pytest-django}
@@ -97,7 +96,9 @@ A web user interface for GNU Mailman
 %package -n %{postorius_pkgname}
 Summary:        A web user interface for GNU Mailman
 Requires:       %{mypython}-Django >= 1.11
+Requires:       %{mypython}-django-debug-toolbar >= 2.2.0
 Requires:       %{mypython}-django-mailman3 >= 1.3.7
+Requires:       %{mypython}-django-requests-debug-toolbar >= 0.0.3
 Requires:       %{mypython}-mailmanclient >= 3.3.2
 Requires:       %{mypython}-readme_renderer
 %if "%{expand:%%%{mypython}_provides}" == "python3"
@@ -199,14 +200,12 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/uwsgi/vassals
 install -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/uwsgi/vassals/postorius.ini
 
 %check
-pushd example_project
+export PYTHONPATH="$(pwd):$(pwd)/src"
-export PYTHONPATH='../src'
 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
 rm -rf build/flavorbin
 rm -rf build/xdgflavorconfig
-popd
 
 %pre -n %{postorius_pkgname}-web
 /usr/sbin/groupadd -r postorius &>/dev/null || :
@@ -246,6 +245,7 @@ fi
 %{postorius_basedir}/static/admin
 %{postorius_basedir}/static/django-mailman3
 %{postorius_basedir}/static/postorius
+%{postorius_basedir}/static/debug_toolbar
 
 %attr(750,root,postorius) %dir %{postorius_etcdir}
 %attr(640,root,postorius) %config(noreplace) %{postorius_etcdir}/settings_local.py