Merge pull request #309338 from mweinelt/pretix-2024.4.0

pretix: 2024.3.0 -> 2024.4.0
This commit is contained in:
Martin Weinelt 2024-05-06 01:04:35 +02:00 committed by GitHub
commit 48705e5f4d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 117 additions and 85 deletions

View File

@ -85,10 +85,16 @@ python.pkgs.buildPythonApplication rec {
]);
pythonRelaxDeps = [
"celery"
"css-inline"
"cssutils"
"django-csp"
"django-filter"
"django-hierarkey"
"markdown"
"pillow"
"python-dateutil"
"reportlab"
];
propagatedBuildInputs = with python.pkgs; [

View File

@ -29,13 +29,13 @@ let
};
pname = "pretix";
version = "2024.3.0";
version = "2024.4.0";
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix";
rev = "refs/tags/v${version}";
hash = "sha256-Wz1vZcqgwyS0xJgTtRxqfaJpJ1fAMhIyxvTvBT/ABSo=";
hash = "sha256-+F5EOMMkO1ngGeFscDipwbldsY0AhOUKbjqgNpuph4g=";
};
npmDeps = buildNpmPackage {
@ -43,7 +43,7 @@ let
inherit version src;
sourceRoot = "${src.name}/src/pretix/static/npm_dir";
npmDepsHash = "sha256-2fHlEEmYzpF3SyvF7+FbwCt+zQVGF0/kslDFnJ+DQGE=";
npmDepsHash = "sha256-0Q/BCRHlnyQJlCF3PgIP9q3Qyr/ff+GP0lPIwPsIMSU=";
dontBuild = true;
@ -81,16 +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 "django-hierarkey==1.1.*" django-hierarkey \
--replace-fail "djangorestframework==3.15.*" djangorestframework \
--replace-fail "dnspython==2.6.*" dnspython \
--replace-fail "django-countries==7.5.*" django-countries \
--replace-fail "django-filter==24.1" django-filter \
--replace-fail "importlib_metadata==7.*" importlib_metadata \
--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.9.*" python-dateutil \
--replace-fail "sentry-sdk==1.42.*" sentry-sdk \
--replace-fail "stripe==7.9.*" stripe
'';
@ -175,6 +174,7 @@ python.pkgs.buildPythonApplication rec {
text-unidecode
tlds
tqdm
ua-parser
vat-moss
vobject
webauthn

View File

@ -52,9 +52,9 @@ dependencies = [
[[package]]
name = "autocfg"
version = "1.2.0"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
[[package]]
name = "backtrace"
@ -73,15 +73,9 @@ dependencies = [
[[package]]
name = "base64"
version = "0.22.0"
version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51"
[[package]]
name = "bitflags"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]]
name = "bitflags"
@ -131,9 +125,9 @@ dependencies = [
[[package]]
name = "cc"
version = "1.0.94"
version = "1.0.96"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7"
checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd"
[[package]]
name = "cfg-if"
@ -186,7 +180,7 @@ checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
[[package]]
name = "css-inline"
version = "0.14.0"
version = "0.14.1"
dependencies = [
"cssparser",
"html5ever",
@ -201,7 +195,7 @@ dependencies = [
[[package]]
name = "css-inline-python"
version = "0.14.0"
version = "0.14.1"
dependencies = [
"built",
"css-inline",
@ -375,9 +369,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
[[package]]
name = "hashbrown"
version = "0.14.3"
version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
dependencies = [
"ahash",
"allocator-api2",
@ -577,15 +571,15 @@ dependencies = [
[[package]]
name = "libc"
version = "0.2.153"
version = "0.2.154"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
[[package]]
name = "lock_api"
version = "0.4.11"
version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
dependencies = [
"autocfg",
"scopeguard",
@ -614,9 +608,9 @@ checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
[[package]]
name = "markup5ever"
version = "0.12.0"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7940b09815a02810a42b9e1bc41c069880a87de68e9b1dcbe754a3ba3b47c20"
checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45"
dependencies = [
"log",
"phf 0.11.2",
@ -675,9 +669,9 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
[[package]]
name = "num-traits"
version = "0.2.18"
version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
dependencies = [
"autocfg",
]
@ -709,9 +703,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
[[package]]
name = "parking_lot"
version = "0.12.1"
version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
dependencies = [
"lock_api",
"parking_lot_core",
@ -719,15 +713,15 @@ dependencies = [
[[package]]
name = "parking_lot_core"
version = "0.9.9"
version = "0.9.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
dependencies = [
"cfg-if",
"libc",
"redox_syscall",
"smallvec",
"windows-targets 0.48.5",
"windows-targets 0.52.5",
]
[[package]]
@ -915,9 +909,9 @@ dependencies = [
[[package]]
name = "pyo3-built"
version = "0.4.7"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be6d574e0f8cab2cdd1eeeb640cbf845c974519fa9e9b62fa9c08ecece0ca5de"
checksum = "35ee655adc94166665a1d714b439e27857dd199b947076891d6a17d32d396cde"
[[package]]
name = "pyo3-ffi"
@ -1015,18 +1009,18 @@ dependencies = [
[[package]]
name = "redox_syscall"
version = "0.4.1"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
dependencies = [
"bitflags 1.3.2",
"bitflags",
]
[[package]]
name = "reqwest"
version = "0.12.3"
version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19"
checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
dependencies = [
"base64",
"bytes",
@ -1093,9 +1087,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustls"
version = "0.22.3"
version = "0.22.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c"
checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
dependencies = [
"log",
"ring",
@ -1117,15 +1111,15 @@ dependencies = [
[[package]]
name = "rustls-pki-types"
version = "1.4.1"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247"
checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54"
[[package]]
name = "rustls-webpki"
version = "0.102.2"
version = "0.102.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610"
checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf"
dependencies = [
"ring",
"rustls-pki-types",
@ -1150,7 +1144,7 @@ version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06"
dependencies = [
"bitflags 2.5.0",
"bitflags",
"cssparser",
"derive_more",
"fxhash",
@ -1174,18 +1168,18 @@ dependencies = [
[[package]]
name = "serde"
version = "1.0.198"
version = "1.0.200"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc"
checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.198"
version = "1.0.200"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9"
checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb"
dependencies = [
"proc-macro2",
"quote",
@ -1256,9 +1250,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]]
name = "socket2"
version = "0.5.6"
version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
dependencies = [
"libc",
"windows-sys 0.52.0",
@ -1808,18 +1802,18 @@ dependencies = [
[[package]]
name = "zerocopy"
version = "0.7.32"
version = "0.7.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
checksum = "087eca3c1eaf8c47b94d02790dd086cd594b912d2043d4de4bfdd466b3befb7c"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
version = "0.7.32"
version = "0.7.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
checksum = "6f4b6c273f496d8fd4eaf18853e6b448760225dc030ff2c485a786859aea6393"
dependencies = [
"proc-macro2",
"quote",

View File

@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "css-inline";
version = "0.14.0";
version = "0.14.1";
pyproject = true;
src = fetchFromGitHub {
owner = "Stranger6667";
repo = "css-inline";
rev = "python-v${version}";
hash = "sha256-CdR90GGPWOerXWfVeHrFLAelL+MJ9bfoB4TjKBdRSL0=";
hash = "sha256-+hX05y+ii2/wAbcc3SPK3ns4slUKFGqHURb3Z08yhVw=";
};
postPatch = ''
@ -42,7 +42,7 @@ buildPythonPackage rec {
ln -s ${./Cargo.lock} Cargo.lock
'';
name = "${pname}-${version}";
hash = "sha256-/GO7OcUl0iFgEhr8ZWZQOTNqHn7bt38PpFs0HktmAhE=";
hash = "sha256-ogzj8JxiFX2VWEeEnKACycd2Bud9VUpLuF4h35eUls0=";
};
nativeBuildInputs = [

View File

@ -1,13 +1,21 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonAtLeast
# build-system
, setuptools
# dependencies
, django
# tests
, factory-boy
, mock
, pip
, pygments
, pytest-django
, pytestCheckHook
, pytest-django
, shortuuid
, vobject
, werkzeug
@ -16,7 +24,11 @@
buildPythonPackage rec {
pname = "django-extensions";
version = "3.2.3";
format = "setuptools";
pyproject = true;
# https://github.com/django-extensions/django-extensions/issues/1831
# Requires asyncore, which was dropped in 3.12
disabled = pythonAtLeast "3.12";
src = fetchFromGitHub {
owner = pname;
@ -30,7 +42,11 @@ buildPythonPackage rec {
--replace "--cov=django_extensions --cov-report html --cov-report term" ""
'';
propagatedBuildInputs = [
build-system = [
setuptools
];
dependencies = [
django
];

View File

@ -2,6 +2,9 @@
, buildPythonPackage
, fetchFromGitHub
# build-system
, setuptools
# propagates
, python-dateutil
@ -13,18 +16,21 @@
buildPythonPackage rec {
pname = "django-hierarkey";
version = "1.1.0";
format = "setuptools";
version = "1.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "raphaelm";
repo = "django-hierarkey";
# https://github.com/raphaelm/django-hierarkey/commit/c81ace02ca404a8756e2931bb6faf55b6365e140
rev = "c81ace02ca404a8756e2931bb6faf55b6365e140";
hash = "sha256-sCARyTjuuAUptlOsFmApnsQpcksP+uYnq0lukXDMcuk=";
rev = "refs/tags/${version}";
hash = "sha256-1LSH9GwoNF3NrDVNUIHDAVsktyKIprDgB5XlIHeM3fM=";
};
propagatedBuildInputs = [
build-system = [
setuptools
];
dependencies = [
python-dateutil
];

View File

@ -7,7 +7,6 @@
# dependencies
, django
, mysqlclient
# tests
, pytest-django
@ -16,23 +15,22 @@
buildPythonPackage rec {
pname = "django-mysql";
version = "4.12.0";
version = "4.13.0";
pyproject = true;
src = fetchFromGitHub {
owner = "adamchainz";
repo = "django-mysql";
rev = "refs/tags/${version}";
hash = "sha256-AieI6zUPFXQsrvoms5bu/Bb3J+DvfLA4rCCsjhYBEZQ=";
hash = "sha256-hIvkLLv9R23u+JC6t/zwbMvmgLMstYp0ytuSqNiohJg=";
};
nativeBuildInputs = [
build-system = [
setuptools
];
buildInputs = [
dependencies = [
django
mysqlclient
];
doCheck = false; # requires mysql/mariadb server
@ -44,6 +42,10 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [
"django_mysql"
];
meta = with lib; {
changelog = "https://github.com/adamchainz/django-mysql/blob/${version}/docs/changelog.rst";
description = "Extensions to Django for use with MySQL/MariaD";

View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "django-otp";
version = "1.3.0post1";
version = "1.5.0";
pyproject = true;
src = fetchFromGitHub {
owner = "django-otp";
repo = "django-otp";
rev = "v${version}";
hash = "sha256-Q8YTCYERyoAXenSiDabxuxaWiD6ZeJKKKgaR/Rg3y20=";
hash = "sha256-c0Yr41S1LFBzcDIK2etOP3rYcCPaThDs+XGiw4WP/ks=";
};
build-system = [

View File

@ -16,15 +16,14 @@
buildPythonPackage rec {
pname = "django-statici18n";
version = "2.4.0";
version = "2.5.0";
pyproject = true;
src = fetchFromGitHub {
owner = "zyegfryed";
repo = "django-statici18n";
# https://github.com/zyegfryed/django-statici18n/issues/59
rev = "9b83a8f0f2e625dd5f56d53cfe4e07aca9479ab6";
hash = "sha256-KrIlWmN7um9ad2avfANOza579bjYkxTo9F0UFpvLu3A=";
rev = "refs/tags/v${version}";
hash = "sha256-n6HqHcXvz2ihwN+gJr5P+/Yt4RpuOu2yAjo9fiNZB54=";
};
build-system = [

View File

@ -86,6 +86,15 @@ buildPythonPackage rec {
"creole/tests/test_rest2html.py"
];
pytestFlagsArray = [
# fixture mismatch after docutils update
"--deselect=creole/rest_tools/clean_writer.py::creole.rest_tools.clean_writer.rest2html"
"--deselect=creole/tests/test_cross_compare_all.py::CrossCompareTests::test_link"
"--deselect=creole/tests/test_cross_compare_all.py::CrossCompareTests::test_link_with_at_sign"
"--deselect=creole/tests/test_cross_compare_all.py::CrossCompareTests::test_link_with_unknown_protocol"
"--deselect=creole/tests/test_cross_compare_all.py::CrossCompareTests::test_link_without_title"
];
meta = with lib; {
description = "Creole markup tools written in Python";
homepage = "https://github.com/jedie/python-creole";

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "webauthn";
version = "2.0.0";
version = "2.1.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "duo-labs";
repo = "py_webauthn";
rev = "refs/tags/v${version}";
hash = "sha256-StqoSrzErV13/OUpSWbI+6N5tSFPEpvnmQcDiZMaXPI=";
hash = "sha256-AfQ3lt0WvoThU5kCE7MzhAXwbqmNaCrUqOMWI937hO4=";
};
propagatedBuildInputs = [