pretix: 2024.2.0 -> 2024.3.0

https://github.com/pretix/pretix/compare/v2024.2.0...v2024.3.0
This commit is contained in:
Martin Weinelt 2024-04-05 11:07:55 +02:00
parent f8302ce759
commit 73ec3796ab
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
2 changed files with 9 additions and 37 deletions

View File

@ -1,12 +0,0 @@
diff --git a/src/pretix/_build_settings.py b/src/pretix/_build_settings.py
index d1ea73b84..9e13cdc87 100644
--- a/src/pretix/_build_settings.py
+++ b/src/pretix/_build_settings.py
@@ -49,6 +49,7 @@ HAS_MEMCACHED = False
HAS_CELERY = False
HAS_GEOIP = False
SENTRY_ENABLED = False
+LANGUAGES = ALL_LANGUAGES
for entry_point in entry_points(group='pretix.plugin'):
INSTALLED_APPS.append(entry_point.module) # noqa: F405

View File

@ -2,7 +2,6 @@
, buildNpmPackage
, fetchFromGitHub
, fetchPypi
, fetchpatch2
, nodejs
, python3
, gettext
@ -30,13 +29,13 @@ let
};
pname = "pretix";
version = "2024.2.0";
version = "2024.3.0";
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix";
rev = "refs/tags/v${version}";
hash = "sha256-emtF5dDXEXN8GIucHbjF+m9Vkg1Jj6nmQdHhBOkXMAs=";
hash = "sha256-Wz1vZcqgwyS0xJgTtRxqfaJpJ1fAMhIyxvTvBT/ABSo=";
};
npmDeps = buildNpmPackage {
@ -44,7 +43,7 @@ let
inherit version src;
sourceRoot = "${src.name}/src/pretix/static/npm_dir";
npmDepsHash = "sha256-kE13dcTdWZZNHPMcHEiK0a2dEcu3Z3/q815YhaVkLbQ=";
npmDepsHash = "sha256-2fHlEEmYzpF3SyvF7+FbwCt+zQVGF0/kslDFnJ+DQGE=";
dontBuild = true;
@ -66,18 +65,6 @@ python.pkgs.buildPythonApplication rec {
# Discover pretix.plugin entrypoints during build and add them into
# INSTALLED_APPS, so that their static files are collected.
./plugin-build.patch
# Configure django-statici18n to compile all available languages at
# build time.
./language-build.patch
(fetchpatch2 {
# Allow customization of cache and log directory
# https://github.com/pretix/pretix/pull/3997
name = "pretix-directory-customization.patch";
url = "https://github.com/pretix/pretix/commit/e151d1d1f08917e547df49da0779b36bb73b7294.patch";
hash = "sha256-lO5eCKSqUaCwSm7rouMTFMwauWl9Tz/Yf0JE/IO+bnI=";
})
];
postPatch = ''
@ -94,13 +81,15 @@ python.pkgs.buildPythonApplication rec {
--replace-fail psycopg2-binary psycopg2 \
--replace-fail vat_moss_forked==2020.3.20.0.11.0 vat-moss \
--replace-fail "bleach==5.0.*" bleach \
--replace-fail "dnspython==2.5.*" dnspython \
--replace-fail "dnspython==2.6.*" dnspython \
--replace-fail "django-filter==24.1" django-filter \
--replace-fail "importlib_metadata==7.*" importlib_metadata \
--replace-fail "protobuf==4.25.*" protobuf \
--replace-fail "markdown==3.6" markdown \
--replace-fail "protobuf==5.26.*" protobuf \
--replace-fail "pycryptodome==3.20.*" pycryptodome \
--replace-fail "pypdf==3.9.*" pypdf \
--replace-fail "python-dateutil==2.8.*" python-dateutil \
--replace-fail "sentry-sdk==1.40.*" sentry-sdk \
--replace-fail "python-dateutil==2.9.*" python-dateutil \
--replace-fail "sentry-sdk==1.42.*" sentry-sdk \
--replace-fail "stripe==7.9.*" stripe
'';
@ -222,11 +211,6 @@ python.pkgs.buildPythonApplication rec {
pytestFlagsArray = [
"--reruns" "3"
# tests fail when run before 4:30am
# https://github.com/pretix/pretix/pull/3987
"--deselect=src/tests/base/test_orders.py::PaymentReminderTests::test_sent_days"
"--deselect=src/tests/plugins/sendmail/test_rules.py::test_sendmail_rule_specified_subevent"
];
preCheck = ''