Merge pull request #301776 from mweinelt/pretix-2024.3.0
pretix: 2024.2.0 -> 2024.3.0
This commit is contained in:
commit
c1b88e1728
|
@ -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
|
|
|
@ -2,7 +2,6 @@
|
||||||
, buildNpmPackage
|
, buildNpmPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
, fetchpatch2
|
|
||||||
, nodejs
|
, nodejs
|
||||||
, python3
|
, python3
|
||||||
, gettext
|
, gettext
|
||||||
|
@ -30,13 +29,13 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
pname = "pretix";
|
pname = "pretix";
|
||||||
version = "2024.2.0";
|
version = "2024.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pretix";
|
owner = "pretix";
|
||||||
repo = "pretix";
|
repo = "pretix";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-emtF5dDXEXN8GIucHbjF+m9Vkg1Jj6nmQdHhBOkXMAs=";
|
hash = "sha256-Wz1vZcqgwyS0xJgTtRxqfaJpJ1fAMhIyxvTvBT/ABSo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
npmDeps = buildNpmPackage {
|
npmDeps = buildNpmPackage {
|
||||||
|
@ -44,7 +43,7 @@ let
|
||||||
inherit version src;
|
inherit version src;
|
||||||
|
|
||||||
sourceRoot = "${src.name}/src/pretix/static/npm_dir";
|
sourceRoot = "${src.name}/src/pretix/static/npm_dir";
|
||||||
npmDepsHash = "sha256-kE13dcTdWZZNHPMcHEiK0a2dEcu3Z3/q815YhaVkLbQ=";
|
npmDepsHash = "sha256-2fHlEEmYzpF3SyvF7+FbwCt+zQVGF0/kslDFnJ+DQGE=";
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|
||||||
|
@ -66,18 +65,6 @@ python.pkgs.buildPythonApplication rec {
|
||||||
# Discover pretix.plugin entrypoints during build and add them into
|
# Discover pretix.plugin entrypoints during build and add them into
|
||||||
# INSTALLED_APPS, so that their static files are collected.
|
# INSTALLED_APPS, so that their static files are collected.
|
||||||
./plugin-build.patch
|
./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 = ''
|
postPatch = ''
|
||||||
|
@ -94,13 +81,15 @@ python.pkgs.buildPythonApplication rec {
|
||||||
--replace-fail psycopg2-binary psycopg2 \
|
--replace-fail psycopg2-binary psycopg2 \
|
||||||
--replace-fail vat_moss_forked==2020.3.20.0.11.0 vat-moss \
|
--replace-fail vat_moss_forked==2020.3.20.0.11.0 vat-moss \
|
||||||
--replace-fail "bleach==5.0.*" bleach \
|
--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 "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 "pycryptodome==3.20.*" pycryptodome \
|
||||||
--replace-fail "pypdf==3.9.*" pypdf \
|
--replace-fail "pypdf==3.9.*" pypdf \
|
||||||
--replace-fail "python-dateutil==2.8.*" python-dateutil \
|
--replace-fail "python-dateutil==2.9.*" python-dateutil \
|
||||||
--replace-fail "sentry-sdk==1.40.*" sentry-sdk \
|
--replace-fail "sentry-sdk==1.42.*" sentry-sdk \
|
||||||
--replace-fail "stripe==7.9.*" stripe
|
--replace-fail "stripe==7.9.*" stripe
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -222,11 +211,6 @@ python.pkgs.buildPythonApplication rec {
|
||||||
|
|
||||||
pytestFlagsArray = [
|
pytestFlagsArray = [
|
||||||
"--reruns" "3"
|
"--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 = ''
|
preCheck = ''
|
||||||
|
|
|
@ -6,22 +6,21 @@
|
||||||
, djangorestframework
|
, djangorestframework
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, pytest-django
|
, pytest-django
|
||||||
, python
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "django-filter";
|
pname = "django-filter";
|
||||||
version = "23.5";
|
version = "24.2";
|
||||||
format = "pyproject";
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-Z1g6pDuR/oxJ90qDLZX02EQr5ij9TG1l6fgR9RU6Tlw=";
|
hash = "sha256-SOX8HaPM1soNX5u1UJc1GM6Xek7d6dKooVSn9PC5+W4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ flit-core ];
|
build-system = [ flit-core ];
|
||||||
|
|
||||||
propagatedBuildInputs = [ django ];
|
dependencies = [ django ];
|
||||||
|
|
||||||
pythonImportsCheck = [
|
pythonImportsCheck = [
|
||||||
"django_filters"
|
"django_filters"
|
||||||
|
@ -38,7 +37,7 @@ buildPythonPackage rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Reusable Django application for allowing users to filter querysets dynamically";
|
description = "Reusable Django application for allowing users to filter querysets dynamically";
|
||||||
homepage = "https://github.com/carltongibson/django-filter";
|
homepage = "https://github.com/carltongibson/django-filter";
|
||||||
changelog = "https://github.com/carltongibson/django-filter/blob/v${version}/CHANGES.rst";
|
changelog = "https://github.com/carltongibson/django-filter/blob/${version}/CHANGES.rst";
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
maintainers = with maintainers; [ mmai ];
|
maintainers = with maintainers; [ mmai ];
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user