CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-09 15:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Django 3.0 and other dependencies (#1568)

Browse Source 
* Upgrade Django to 3.0 and other dependencies to recent versions

* Fix otp version contsraint

* Remove six dependency

* Resolve some warnings

* Fix failing tests

* Update django-countries

* Resolve all RemovedInDjango31Warnings in test suite

* Run isort

* Fix import

* Update PostgreSQL version on travis
This commit is contained in:
Raphael Michel
2020-03-23 15:02:20 +01:00
committed by GitHub
parent 7e9c9beace
commit af23d6e4bf
174 changed files with 380 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pretix/plugins/badges/exporters.py
View File

@@ -11,7 +11,7 @@ from django.core.files import File
from django.core.files.storage import default_storage
from django.db.models import Exists, OuterRef
from django.db.models.functions import Coalesce
from django.utils.translation import ugettext as _, ugettext_lazy
from django.utils.translation import gettext as _, gettext_lazy
from jsonfallback.functions import JSONExtract
from reportlab.lib import pagesizes
from reportlab.lib.units import mm
@@ -38,7 +38,7 @@ def _renderer(event, layout):
OPTIONS = OrderedDict([
('one', {
'name': ugettext_lazy('One badge per page'),
'name': gettext_lazy('One badge per page'),
'cols': 1,
'rows': 1,
'margins': [0, 0, 0, 0],
@@ -46,7 +46,7 @@ OPTIONS = OrderedDict([
'pagesize': None,
}),
('a4_a6l', {
'name': ugettext_lazy('4 landscape A6 pages on one A4 page'),
'name': gettext_lazy('4 landscape A6 pages on one A4 page'),
'cols': 2,
'rows': 2,
'margins': [0 * mm, 0 * mm, 0 * mm, 0 * mm],
@@ -54,7 +54,7 @@ OPTIONS = OrderedDict([
'pagesize': pagesizes.landscape(pagesizes.A4),
}),
('a4_a6p', {
'name': ugettext_lazy('4 portrait A6 pages on one A4 page'),
'name': gettext_lazy('4 portrait A6 pages on one A4 page'),
'cols': 2,
'rows': 2,
'margins': [0 * mm, 0 * mm, 0 * mm, 0 * mm],
@@ -62,7 +62,7 @@ OPTIONS = OrderedDict([
'pagesize': pagesizes.portrait(pagesizes.A4),
}),
('a4_a7l', {
'name': ugettext_lazy('8 landscape A7 pages on one A4 page'),
'name': gettext_lazy('8 landscape A7 pages on one A4 page'),
'cols': 2,
'rows': 4,
'margins': [0 * mm, 0 * mm, 0 * mm, 0 * mm],
@@ -70,7 +70,7 @@ OPTIONS = OrderedDict([
'pagesize': pagesizes.portrait(pagesizes.A4),
}),
('a4_a7p', {
'name': ugettext_lazy('8 portrait A7 pages on one A4 page'),
'name': gettext_lazy('8 portrait A7 pages on one A4 page'),
'cols': 4,
'rows': 2,
'margins': [0 * mm, 0 * mm, 0 * mm, 0 * mm],