From c6084954a9d199815f90bf2b58899a61bc683ad8 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Sat, 17 Dec 2022 18:18:51 +0100 Subject: [PATCH] Stop using deprecated Django APIs --- pretix_servicefees/__init__.py | 22 +--------------------- pretix_servicefees/apps.py | 21 +++++++++++++++++++++ pretix_servicefees/urls.py | 4 ++-- setup.py | 3 ++- 4 files changed, 26 insertions(+), 24 deletions(-) create mode 100644 pretix_servicefees/apps.py diff --git a/pretix_servicefees/__init__.py b/pretix_servicefees/__init__.py index 5d5cb2e..52af183 100644 --- a/pretix_servicefees/__init__.py +++ b/pretix_servicefees/__init__.py @@ -1,21 +1 @@ -from django.apps import AppConfig -from django.utils.translation import gettext_lazy - - -class PluginApp(AppConfig): - name = 'pretix_servicefees' - verbose_name = 'Service Fees' - - class PretixPluginMeta: - name = gettext_lazy('Service Fees') - author = 'Raphael Michel' - category = 'FEATURE' - description = gettext_lazy('This plugin allows to charge a service fee on all non-free orders.') - visible = True - version = '1.10.0' - - def ready(self): - from . import signals # NOQA - - -default_app_config = 'pretix_servicefees.PluginApp' +__version__ = '1.10.0' diff --git a/pretix_servicefees/apps.py b/pretix_servicefees/apps.py new file mode 100644 index 0000000..c558967 --- /dev/null +++ b/pretix_servicefees/apps.py @@ -0,0 +1,21 @@ +from django.apps import AppConfig +from django.utils.translation import gettext_lazy +from . import __version__ + + +class PluginApp(AppConfig): + name = 'pretix_servicefees' + verbose_name = 'Service Fees' + + class PretixPluginMeta: + name = gettext_lazy('Service Fees') + author = 'Raphael Michel' + category = 'FEATURE' + description = gettext_lazy('This plugin allows to charge a service fee on all non-free orders.') + visible = True + version = __version__ + + def ready(self): + from . import signals # NOQA + + diff --git a/pretix_servicefees/urls.py b/pretix_servicefees/urls.py index 7ecdff5..fae3b55 100644 --- a/pretix_servicefees/urls.py +++ b/pretix_servicefees/urls.py @@ -1,8 +1,8 @@ -from django.conf.urls import url +from django.urls import path from .views import SettingsView urlpatterns = [ - url(r'^control/event/(?P[^/]+)/(?P[^/]+)/settings/servicefees/$', + path('control/event///settings/servicefees/', SettingsView.as_view(), name='settings'), ] diff --git a/setup.py b/setup.py index a115ae1..08fb58c 100644 --- a/setup.py +++ b/setup.py @@ -3,6 +3,7 @@ from distutils.command.build import build from django.core import management from setuptools import setup, find_packages +from pretix_servicefees import __version__ try: @@ -25,7 +26,7 @@ cmdclass = { setup( name='pretix-servicefees', - version='1.10.0', + version=__version__, description='Allows you to impose a service fee on all non-free orders.', long_description=long_description, url='https://github.com/pretix/pretix-servicefees',