Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-django-avatar for openSUSE:Factory checked in at 2022-02-03 23:16:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-django-avatar (Old) and /work/SRC/openSUSE:Factory/.python-django-avatar.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-avatar" Thu Feb 3 23:16:44 2022 rev:10 rq:950837 version:5.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-django-avatar/python-django-avatar.changes 2020-01-07 23:54:52.636078770 +0100 +++ /work/SRC/openSUSE:Factory/.python-django-avatar.new.1898/python-django-avatar.changes 2022-02-03 23:17:42.464112592 +0100 @@ -1,0 +2,6 @@ +Thu Feb 3 02:04:42 UTC 2022 - Steve Kowalik <steven.kowa...@suse.com> + +- Add patch support-django-40.patch: + * Support Django 4.0. + +------------------------------------------------------------------- New: ---- support-django-40.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-django-avatar.spec ++++++ --- /var/tmp/diff_new_pack.udooXX/_old 2022-02-03 23:17:42.908109561 +0100 +++ /var/tmp/diff_new_pack.udooXX/_new 2022-02-03 23:17:42.920109479 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-django-avatar # -# 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 @@ -23,6 +23,8 @@ License: BSD-3-Clause URL: https://github.com/grantmcconnaughey/django-avatar/ Source: https://files.pythonhosted.org/packages/source/d/django-avatar/django-avatar-%{version}.tar.gz +# PATCH-FIX-UPSTREAM gh#grantmcconnaughey/django-avatar#201 +Patch0: support-django-40.patch BuildRequires: %{python_module Django >= 1.11} BuildRequires: %{python_module Pillow >= 2.0} BuildRequires: %{python_module django-appconf >= 0.6} @@ -42,7 +44,7 @@ file storage backend for retrieval later. %prep -%setup -q -n django-avatar-%{version} +%autosetup -p1 -n django-avatar-%{version} %build %python_build @@ -52,7 +54,7 @@ %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%python_expand %{_bindir}/django-admin.py-%{$python_bin_suffix} test --settings=tests.settings --pythonpath=`pwd` +%python_expand %{_bindir}/django-admin-%{$python_bin_suffix} test --settings=tests.settings --pythonpath=`pwd` %files %{python_files} %license LICENSE.txt ++++++ support-django-40.patch ++++++ >From 701a04e372dc66340959015181af498e7121dde1 Mon Sep 17 00:00:00 2001 From: Luis Ernesto Assandri <luigi.assan...@icloud.com> Date: Thu, 9 Dec 2021 11:50:31 +0100 Subject: [PATCH 1/5] Fixed deprecated library. --- avatar/admin.py | 2 +- avatar/forms.py | 2 +- avatar/models.py | 2 +- avatar/templatetags/avatar_tags.py | 2 +- avatar/views.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) Index: django-avatar-5.0.0/avatar/admin.py =================================================================== --- django-avatar-5.0.0.orig/avatar/admin.py +++ django-avatar-5.0.0/avatar/admin.py @@ -4,7 +4,7 @@ try: from django.utils import six except ImportError: import six -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.template.loader import render_to_string from avatar.models import Avatar Index: django-avatar-5.0.0/avatar/forms.py =================================================================== --- django-avatar-5.0.0.orig/avatar/forms.py +++ django-avatar-5.0.0/avatar/forms.py @@ -9,7 +9,7 @@ try: from django.utils import six except ImportError: import six -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.template.defaultfilters import filesizeformat from avatar.conf import settings Index: django-avatar-5.0.0/avatar/models.py =================================================================== --- django-avatar-5.0.0.orig/avatar/models.py +++ django-avatar-5.0.0/avatar/models.py @@ -9,8 +9,8 @@ from django.core.files import File from django.core.files.base import ContentFile from django.core.files.storage import get_storage_class from django.utils.module_loading import import_string -from django.utils.translation import ugettext_lazy as _ -from django.utils.encoding import force_text +from django.utils.translation import gettext_lazy as _ +from django.utils.encoding import force_str from django.db.models import signals from avatar.conf import settings @@ -39,7 +39,7 @@ def avatar_path_handler(instance=None, f if settings.AVATAR_EXPOSE_USERNAMES: tmppath.append(get_username(instance.user)) else: - tmppath.append(force_text(instance.user.pk)) + tmppath.append(force_str(instance.user.pk)) if not filename: # Filename already stored in database filename = instance.avatar.name Index: django-avatar-5.0.0/avatar/templatetags/avatar_tags.py =================================================================== --- django-avatar-5.0.0.orig/avatar/templatetags/avatar_tags.py +++ django-avatar-5.0.0/avatar/templatetags/avatar_tags.py @@ -10,7 +10,7 @@ try: from django.utils import six except ImportError: import six -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from django.utils.module_loading import import_string from avatar.conf import settings Index: django-avatar-5.0.0/avatar/views.py =================================================================== --- django-avatar-5.0.0.orig/avatar/views.py +++ django-avatar-5.0.0/avatar/views.py @@ -1,5 +1,5 @@ from django.shortcuts import render, redirect -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ # Issue 182: six no longer included with Django 3.0 try: from django.utils import six Index: django-avatar-5.0.0/avatar/signals.py =================================================================== --- django-avatar-5.0.0.orig/avatar/signals.py +++ django-avatar-5.0.0/avatar/signals.py @@ -1,5 +1,5 @@ import django.dispatch -avatar_updated = django.dispatch.Signal(providing_args=["user", "avatar"]) -avatar_deleted = django.dispatch.Signal(providing_args=["user", "avatar"]) +avatar_updated = django.dispatch.Signal() +avatar_deleted = django.dispatch.Signal() Index: django-avatar-5.0.0/avatar/urls.py =================================================================== --- django-avatar-5.0.0.orig/avatar/urls.py +++ django-avatar-5.0.0/avatar/urls.py @@ -1,12 +1,12 @@ -from django.conf.urls import url +from django.urls import re_path from avatar import views urlpatterns = [ - url(r'^add/$', views.add, name='avatar_add'), - url(r'^change/$', views.change, name='avatar_change'), - url(r'^delete/$', views.delete, name='avatar_delete'), - url(r'^render_primary/(?P<user>[\w\d\@\.\-_]+)/(?P<size>[\d]+)/$', + re_path(r'^add/$', views.add, name='avatar_add'), + re_path(r'^change/$', views.change, name='avatar_change'), + re_path(r'^delete/$', views.delete, name='avatar_delete'), + re_path(r'^render_primary/(?P<user>[\w\d\@\.\-_]+)/(?P<size>[\d]+)/$', views.render_primary, name='avatar_render_primary'), ] Index: django-avatar-5.0.0/tests/urls.py =================================================================== --- django-avatar-5.0.0.orig/tests/urls.py +++ django-avatar-5.0.0/tests/urls.py @@ -1,6 +1,6 @@ -from django.conf.urls import include, url +from django.urls import include, re_path urlpatterns = [ - url(r'^avatar/', include('avatar.urls')), + re_path(r'^avatar/', include('avatar.urls')), ]