Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-django-invitations for
openSUSE:Factory checked in at 2022-03-02 18:20:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-django-invitations (Old)
and /work/SRC/openSUSE:Factory/.python-django-invitations.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-invitations"
Wed Mar 2 18:20:34 2022 rev:5 rq:958357 version:1.9.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-django-invitations/python-django-invitations.changes
2020-02-20 14:59:13.798741275 +0100
+++
/work/SRC/openSUSE:Factory/.python-django-invitations.new.1958/python-django-invitations.changes
2022-03-02 18:20:52.132655451 +0100
@@ -1,0 +2,6 @@
+Tue Mar 1 05:15:59 UTC 2022 - Steve Kowalik <steven.kowa...@suse.com>
+
+- Add patch django-4.0.patch:
+ * Support Django 4.0
+
+-------------------------------------------------------------------
New:
----
django-4.0.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-django-invitations.spec ++++++
--- /var/tmp/diff_new_pack.j4z3Cg/_old 2022-03-02 18:20:52.584655467 +0100
+++ /var/tmp/diff_new_pack.j4z3Cg/_new 2022-03-02 18:20:52.592655467 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-django-invitations
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,6 +25,8 @@
License: GPL-3.0-only
URL: https://github.com/bee-keeper/django-invitations
Source:
https://github.com/bee-keeper/django-invitations/archive/%{version}.tar.gz
+# PATCH-FIX-UPSTREAM gh#bee-keeper/django-invitations#169
+Patch0: django-4.0.patch
BuildRequires: %{python_module Django >= 1.11}
BuildRequires: %{python_module django-allauth}
BuildRequires: %{python_module freezegun >= 0.3.5}
@@ -43,7 +45,7 @@
Generic invitations app with support for Django-allauth.
%prep
-%setup -q -n django-invitations-%{version}
+%autosetup -p1 -n django-invitations-%{version}
rm tox.ini
%build
++++++ django-4.0.patch ++++++
>From aea2bd6c725eb06da51fd99abcac232cbf857f06 Mon Sep 17 00:00:00 2001
From: saschahofmann <sascha.kele...@gmail.com>
Date: Wed, 9 Feb 2022 09:02:30 +0100
Subject: [PATCH 1/4] Update import for django 4.0
---
invitations/adapters.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
Index: django-invitations-1.9.3/invitations/adapters.py
===================================================================
--- django-invitations-1.9.3.orig/invitations/adapters.py
+++ django-invitations-1.9.3/invitations/adapters.py
@@ -9,9 +9,12 @@ from .app_settings import app_settings
from .utils import import_attribute
try:
- from django.utils.encoding import force_text
+ from django.utils.encoding import force_str as force_text
except ImportError:
- from django.utils.encoding import force_unicode as force_text
+ try:
+ from django.utils.encoding import force_text
+ except ImportError:
+ from django.utils.encoding import force_unicode as force_text
# Code credits here to django-allauth
Index: django-invitations-1.9.3/invitations/base_invitation.py
===================================================================
--- django-invitations-1.9.3.orig/invitations/base_invitation.py
+++ django-invitations-1.9.3/invitations/base_invitation.py
@@ -1,6 +1,6 @@
from django.conf import settings
from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
from .managers import BaseInvitationManager
Index: django-invitations-1.9.3/invitations/forms.py
===================================================================
--- django-invitations-1.9.3.orig/invitations/forms.py
+++ django-invitations-1.9.3/invitations/forms.py
@@ -1,6 +1,6 @@
from django import forms
from django.contrib.auth import get_user_model
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
from .adapters import get_invitations_adapter
from .exceptions import AlreadyAccepted, AlreadyInvited, UserRegisteredEmail
Index: django-invitations-1.9.3/invitations/models.py
===================================================================
--- django-invitations-1.9.3.orig/invitations/models.py
+++ django-invitations-1.9.3/invitations/models.py
@@ -9,7 +9,7 @@ except ImportError:
from django.db import models
from django.utils import timezone
from django.utils.crypto import get_random_string
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
from . import signals
from .adapters import get_invitations_adapter
Index: django-invitations-1.9.3/invitations/views.py
===================================================================
--- django-invitations-1.9.3.orig/invitations/views.py
+++ django-invitations-1.9.3/invitations/views.py
@@ -7,7 +7,7 @@ from django.core.validators import valid
from django.http import Http404, HttpResponse
from django.shortcuts import redirect
from django.utils.decorators import method_decorator
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
from django.views.generic import FormView, View
from django.views.generic.detail import SingleObjectMixin
Index: django-invitations-1.9.3/invitations/signals.py
===================================================================
--- django-invitations-1.9.3.orig/invitations/signals.py
+++ django-invitations-1.9.3/invitations/signals.py
@@ -1,7 +1,7 @@
from django.dispatch import Signal
-invite_url_sent = Signal(providing_args=['invite_url_sent', 'inviter'])
-invite_accepted = Signal(providing_args=['email'])
+invite_url_sent = Signal()
+invite_accepted = Signal()
"""
@receiver(invite_url_sent, sender=Invitation)
Index: django-invitations-1.9.3/invitations/urls.py
===================================================================
--- django-invitations-1.9.3.orig/invitations/urls.py
+++ django-invitations-1.9.3/invitations/urls.py
@@ -1,15 +1,15 @@
-from django.conf.urls import url
+from django.urls import re_path
from . import views
app_name = 'invitations'
urlpatterns = [
- url(r'^send-invite/$', views.SendInvite.as_view(),
+ re_path(r'^send-invite/$', views.SendInvite.as_view(),
name='send-invite'),
- url(r'^send-json-invite/$', views.SendJSONInvite.as_view(),
+ re_path(r'^send-json-invite/$', views.SendJSONInvite.as_view(),
name='send-json-invite'),
- url(r'^accept-invite/(?P<key>\w+)/?$', views.AcceptInvite.as_view(),
+ re_path(r'^accept-invite/(?P<key>\w+)/?$', views.AcceptInvite.as_view(),
name='accept-invite'),
]
Index: django-invitations-1.9.3/test_urls.py
===================================================================
--- django-invitations-1.9.3.orig/test_urls.py
+++ django-invitations-1.9.3/test_urls.py
@@ -1,15 +1,15 @@
-from django.conf.urls import url, include
from django.contrib import admin
from django.conf import settings
+from django.urls import include, re_path
admin.autodiscover()
urlpatterns = [
- url(r'^invitations/', include('invitations.urls')),
- url(r'^admin/', admin.site.urls),
+ re_path(r'^invitations/', include('invitations.urls')),
+ re_path(r'^admin/', admin.site.urls),
]
if 'allauth' in settings.INSTALLED_APPS:
urlpatterns.append(
- url(r'^accounts/', include('allauth.urls'))
+ re_path(r'^accounts/', include('allauth.urls'))
)
