From 8c1235a549ee7545e1322be084f27e238fe6b8fd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 5 May 2024 23:06:50 +0200 Subject: [PATCH 01/10] python312Packages.aiodhcpwatcher: restrict to linux --- pkgs/development/python-modules/aiodhcpwatcher/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/aiodhcpwatcher/default.nix b/pkgs/development/python-modules/aiodhcpwatcher/default.nix index 5c8adc9b4b99..1cdc26eead5d 100644 --- a/pkgs/development/python-modules/aiodhcpwatcher/default.nix +++ b/pkgs/development/python-modules/aiodhcpwatcher/default.nix @@ -52,5 +52,6 @@ buildPythonPackage rec { changelog = "https://github.com/bdraco/aiodhcpwatcher/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ hexa ]; + platforms = platforms.linux; }; } From 923517acd6b73d13f28283aae05ad9e696af9020 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 5 May 2024 23:12:04 +0200 Subject: [PATCH 02/10] python312Packages.faster-fifo: pin to gcc12 on linux --- pkgs/development/python-modules/faster-fifo/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/faster-fifo/default.nix b/pkgs/development/python-modules/faster-fifo/default.nix index 1d77707b6aa5..a3b8f491a9da 100644 --- a/pkgs/development/python-modules/faster-fifo/default.nix +++ b/pkgs/development/python-modules/faster-fifo/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub +, stdenv +, gcc12Stdenv # build-system , cython @@ -11,11 +13,17 @@ , unittestCheckHook }: +let + stdenv' = if stdenv.isLinux then gcc12Stdenv else stdenv; +in buildPythonPackage rec { pname = "faster-fifo"; version = "1.4.5"; format = "pyproject"; + # https://github.com/alex-petrenko/faster-fifo/issues/47\ + stdenv = stdenv'; + src = fetchFromGitHub { owner = "alex-petrenko"; repo = "faster-fifo"; From 28ebb58c192ae051f465e877ac6bc5fb2e3f5dff Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 5 May 2024 23:30:36 +0200 Subject: [PATCH 03/10] python312Packages.paypalhttp: fix tests --- pkgs/development/python-modules/paypalhttp/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/paypalhttp/default.nix b/pkgs/development/python-modules/paypalhttp/default.nix index 25c6aa1ba878..ab0228ef06ab 100644 --- a/pkgs/development/python-modules/paypalhttp/default.nix +++ b/pkgs/development/python-modules/paypalhttp/default.nix @@ -24,6 +24,11 @@ buildPythonPackage rec { hash = "sha256-3ihcpYtpcejPkiyf4g4jveyNU6flQB2sv9EZ5Pd7tUc="; }; + postPatch = '' + substituteInPlace tests/http_response_test.py \ + --replace-fail assertEquals assertEqual + ''; + propagatedBuildInputs = [ requests six From a9ca19279fb03ddc8cfc7884f27f234674dceaaf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 5 May 2024 23:52:12 +0200 Subject: [PATCH 04/10] python312Packages.samplerate: 0.1.0 -> 0.2.1 --- .../python-modules/samplerate/default.nix | 43 ++++++++++++++----- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix index 7ac9950a6966..0b7d81a94d96 100644 --- a/pkgs/development/python-modules/samplerate/default.nix +++ b/pkgs/development/python-modules/samplerate/default.nix @@ -2,33 +2,56 @@ , stdenv , buildPythonPackage , fetchFromGitHub + +# build-system +, cmake +, setuptools +, setuptools-scm +, pybind11 + +# dependencies , cffi , numpy + +# native dependencies , libsamplerate + +# tests , pytestCheckHook }: buildPythonPackage rec { pname = "samplerate"; - version = "0.1.0"; - format = "setuptools"; + version = "0.2.1"; + pyproject = true; src = fetchFromGitHub { owner = "tuxu"; repo = "python-samplerate"; - rev = "refs/tags/${version}"; - hash = "sha256-lHZ9SVnKcsEsnKYXR/QocGbKPEoA7yCZxXvrNPeH1rA="; + rev = "refs/tags/v${version}"; + hash = "sha256-/9NFJcn8R0DFjVhFAIYOtzZM90hjVIfsVXFlS0nHNhA="; }; postPatch = '' - substituteInPlace setup.py \ - --replace ", 'pytest-runner'" "" - - substituteInPlace samplerate/lowlevel.py --replace \ - "lib_filename = _find_library('samplerate')" \ - 'lib_filename = "${libsamplerate.out}/lib/libsamplerate${stdenv.hostPlatform.extensions.sharedLibrary}"' + # unvendor pybind11, libsamplerate + rm -r external + substituteInPlace CMakeLists.txt \ + --replace-fail "add_subdirectory(external)" "find_package(pybind11 REQUIRED)" ''; + build-system = [ + cmake + setuptools + setuptools-scm + pybind11 + ]; + + dontUseCmakeConfigure = true; + + buildInputs = [ + libsamplerate + ]; + propagatedBuildInputs = [ cffi numpy From 3e29c48b7de5c0b23366a672a8522e90ec92d132 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 5 May 2024 23:57:10 +0200 Subject: [PATCH 05/10] python312Packages.wxpython: disable Requires distutils. --- pkgs/development/python-modules/wxpython/4.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix index 70175f58c449..c2e4f1b0c36e 100644 --- a/pkgs/development/python-modules/wxpython/4.2.nix +++ b/pkgs/development/python-modules/wxpython/4.2.nix @@ -2,7 +2,7 @@ , stdenv , buildPythonPackage , setuptools -, pythonOlder +, pythonAtLeast , fetchPypi , substituteAll @@ -43,7 +43,7 @@ buildPythonPackage rec { pname = "wxpython"; version = "4.2.1"; format = "other"; - disabled = pythonOlder "3.7"; + disabled = pythonAtLeast "3.12"; src = fetchPypi { pname = "wxPython"; From 9c477c5e569c44d808500c8ae70434076483000c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 6 May 2024 01:05:48 +0200 Subject: [PATCH 06/10] pretix: disable unreliable test --- pkgs/by-name/pr/pretix/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index d97d2a68bde5..a45fdbdf2ff3 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -213,6 +213,11 @@ python.pkgs.buildPythonApplication rec { "--reruns" "3" ]; + disabledTests = [ + # unreliable around day changes + "test_order_create_invoice" + ]; + preCheck = '' export PYTHONPATH=$(pwd)/src:$PYTHONPATH export DJANGO_SETTINGS_MODULE=tests.settings From f7c19fedfa0b39ccc03a7a47e7cd128dc3c713a0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 6 May 2024 01:29:33 +0200 Subject: [PATCH 07/10] python312Packages.pytest-mpl: migrate to pynose --- pkgs/development/python-modules/pytest-mpl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index f0ea49d1b767..2399379fdb24 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -5,7 +5,7 @@ , pytest , jinja2 , matplotlib -, nose +, pynose , pillow , pytestCheckHook }: @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 matplotlib - nose + pynose pillow ]; From a2d71d4aecf7a46f508a335bd11f50e508ad763c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 6 May 2024 10:16:41 +0200 Subject: [PATCH 08/10] python312Packages.librosa: 0.10.1 -> 0.10.2 https://github.com/librosa/librosa/releases/tag/0.10.2 --- .../python-modules/librosa/default.nix | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index 62d712aa7b1f..77bfb6aeca90 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch # build-system , setuptools @@ -34,7 +33,7 @@ buildPythonPackage rec { pname = "librosa"; - version = "0.10.1"; + version = "0.10.2"; format = "pyproject"; src = fetchFromGitHub { @@ -42,26 +41,16 @@ buildPythonPackage rec { repo = "librosa"; rev = "refs/tags/${version}"; fetchSubmodules = true; # for test data - hash = "sha256-zbmU87hI9A1CVcBZ/5FU8z0t6SS4jfJk9bj9kLe/EHI="; + hash = "sha256-zUKljPKWOhyb3Zv4KEUcvLsVkxVhL+rzErKycAl6jIg="; }; nativeBuildInputs = [ setuptools ]; - patches = [ - (fetchpatch { - # https://github.com/librosa/librosa/issues/1754 - # https://github.com/librosa/librosa/pull/1755 - name = "matplotlib-3.8-compat.patch"; - url = "https://github.com/librosa/librosa/commit/beef47885ce1255b43b65e48ea2054ddace37c6c.patch"; - hash = "sha256-rrnlUHXHY2me4BWGs3wFq8WJmz75CbXTWKFp3VdJKzE="; - }) - ]; - postPatch = '' substituteInPlace setup.cfg \ - --replace "--cov-report term-missing --cov librosa --cov-report=xml " "" + --replace-fail "--cov-report term-missing --cov librosa --cov-report=xml " "" ''; propagatedBuildInputs = [ @@ -107,11 +96,20 @@ buildPythonPackage rec { "test_example" "test_example_info" "test_load_resample" - # does not converge - "test_nnls_vector" + "test_cite_released" + "test_cite_badversion" + "test_cite_unreleased" ] ++ lib.optionals stdenv.isDarwin [ - # https://github.com/librosa/librosa/pull/1808 - "test_pyin_multi_center" + # crashing the python interpreter + "test_unknown_time_unit" + "test_unknown_wavaxis" + "test_waveshow_unknown_wavaxis" + "test_waveshow_bad_maxpoints" + "test_waveshow_deladaptor" + "test_waveshow_disconnect" + "test_unknown_axis" + "test_axis_bound_warning" + "test_auto_aspect" ]; meta = with lib; { From d0b4bc8ddf414bd4cddfda11c822fb65c7953602 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 6 May 2024 10:49:49 +0200 Subject: [PATCH 09/10] python312Packages.pyct: disable Requires distutils. --- pkgs/development/python-modules/pyct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix index 4897a7e54917..7f8f85b1b650 100644 --- a/pkgs/development/python-modules/pyct/default.nix +++ b/pkgs/development/python-modules/pyct/default.nix @@ -3,7 +3,7 @@ , fetchPypi , param , pytestCheckHook -, pythonOlder +, pythonAtLeast , pyyaml , requests }: @@ -13,7 +13,7 @@ buildPythonPackage rec { version = "0.5.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; From e726d8621a6e13210218e8cf96f81dbbdd29ab3b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 6 May 2024 11:26:15 +0200 Subject: [PATCH 10/10] python312Packages.tensorflow: disable Build requires distutils. --- pkgs/development/python-modules/tensorflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 069b87b76f84..ea8dbf13e942 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -1,7 +1,7 @@ { stdenv, bazel_5, buildBazelPackage, lib, fetchFromGitHub, symlinkJoin , addOpenGLRunpath, fetchpatch, fetchzip, linkFarm # Python deps -, buildPythonPackage, pythonOlder, python +, buildPythonPackage, pythonAtLeast, pythonOlder, python # Python libraries , numpy, tensorboard, abseil-cpp, absl-py , packaging, setuptools, wheel, keras-preprocessing, google-pasta @@ -500,7 +500,7 @@ let in buildPythonPackage { inherit version pname; - disabled = pythonOlder "3.8"; + disabled = pythonAtLeast "3.12"; src = bazel-build.python;