From 9a53dc9c5e76cc2c82c644c1e8db68260a85b1c8 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Fri, 3 Mar 2023 14:05:50 +0100 Subject: [PATCH] Move from PyPDF2 to pypdf again --- src/pretix/plugins/badges/exporters.py | 4 ++-- src/setup.cfg | 1 - src/setup.py | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/pretix/plugins/badges/exporters.py b/src/pretix/plugins/badges/exporters.py index 2b4c835617..9947001d37 100644 --- a/src/pretix/plugins/badges/exporters.py +++ b/src/pretix/plugins/badges/exporters.py @@ -51,8 +51,8 @@ from django.db.models import Exists, OuterRef, Q, Subquery from django.db.models.functions import Cast, Coalesce from django.utils.timezone import make_aware from django.utils.translation import gettext as _, gettext_lazy, pgettext_lazy -from PyPDF2 import PdfMerger, PdfReader, PdfWriter, Transformation -from PyPDF2.generic import RectangleObject +from pypdf import PdfMerger, PdfReader, PdfWriter, Transformation +from pypdf.generic import RectangleObject from reportlab.lib import pagesizes from reportlab.lib.units import mm from reportlab.pdfgen import canvas diff --git a/src/setup.cfg b/src/setup.cfg index c1b435843a..3da723965a 100644 --- a/src/setup.cfg +++ b/src/setup.cfg @@ -28,7 +28,6 @@ filterwarnings = ignore::DeprecationWarning:kombu ignore::DeprecationWarning:django ignore::DeprecationWarning:cgi - ignore:PyPDF2 is deprecated:DeprecationWarning ignore:the load_module.* method is deprecated:DeprecationWarning ignore::ImportWarning ignore::ResourceWarning diff --git a/src/setup.py b/src/setup.py index 116fba1b15..56979399a0 100644 --- a/src/setup.py +++ b/src/setup.py @@ -212,8 +212,7 @@ setup( 'pycountry', 'pycparser==2.21', 'pycryptodome==3.17.*', - 'PyPDF2==2.12.*', # until https://github.com/py-pdf/pypdf/issues/1640 is fixed - 'pypdf==3.4.*', + 'pypdf==3.5.*', 'python-bidi==0.4.*', # Support for Arabic in reportlab 'python-dateutil==2.8.*', 'python-u2flib-server==4.*',