diff options
| author | nixpkgs-ci[bot] <190413589+nixpkgs-ci[bot]@users.noreply.github.com> | 2025-05-21 00:24:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-21 00:24:07 +0000 |
| commit | c19fbb594dd6dcb77889c07f1620ec2655e66e89 (patch) | |
| tree | 1aeaed5f4460e4e2c4b0456cd30f91dd1cf18bd8 /pkgs/development/python-modules | |
| parent | 278d2236084a8ff00cd7c84567f968e9ed33e933 (diff) | |
| parent | 873183508cf8cdb6751f24d31fc01122fd1797f1 (diff) | |
Merge 873183508cf8cdb6751f24d31fc01122fd1797f1 into haskell-updates
Diffstat (limited to 'pkgs/development/python-modules')
35 files changed, 250 insertions, 239 deletions
diff --git a/pkgs/development/python-modules/aider-chat/default.nix b/pkgs/development/python-modules/aider-chat/default.nix index 72fe6f9f4a50..4aa6ae731311 100644 --- a/pkgs/development/python-modules/aider-chat/default.nix +++ b/pkgs/development/python-modules/aider-chat/default.nix @@ -285,9 +285,6 @@ let "test_main_exit_calls_version_check" # AssertionError: assert 2 == 1 "test_simple_send_non_retryable_error" - # Broken tests (Aider-AI/aider#3679) - "test_language_ocaml" - "test_language_ocaml_interface" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Tests fails on darwin diff --git a/pkgs/development/python-modules/aiontfy/default.nix b/pkgs/development/python-modules/aiontfy/default.nix index f369add3574b..625522b20319 100644 --- a/pkgs/development/python-modules/aiontfy/default.nix +++ b/pkgs/development/python-modules/aiontfy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "aiontfy"; - version = "0.5.1"; + version = "0.5.3"; pyproject = true; src = fetchFromGitHub { owner = "tr4nt0r"; repo = "aiontfy"; tag = "v${version}"; - hash = "sha256-WQb6sNjpQVgh+9vH7EyrmJHCWL0Mcmw4hHPHa8KsLYc="; + hash = "sha256-xDcx0darzaTRNdtsNTK7rdO5W22Tpt13ZPDOSmO8M8M="; }; build-system = [ diff --git a/pkgs/development/python-modules/albumentations/default.nix b/pkgs/development/python-modules/albumentations/default.nix index c20117d3b363..a4b62d21c3b9 100644 --- a/pkgs/development/python-modules/albumentations/default.nix +++ b/pkgs/development/python-modules/albumentations/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "albumentations"; - version = "2.0.6"; + version = "2.0.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "albumentations-team"; repo = "albumentations"; tag = version; - hash = "sha256-n00WE8RwwLx/vHRkIrOhrampFPVkPhAkS6zZ4XjEHTk="; + hash = "sha256-3obvlYj+UwniEf+NokJDNqMysCGFXcJdI1Wckdfng2Y="; }; patches = [ @@ -88,7 +88,7 @@ buildPythonPackage rec { meta = { description = "Fast image augmentation library and easy to use wrapper around other libraries"; homepage = "https://github.com/albumentations-team/albumentations"; - changelog = "https://github.com/albumentations-team/albumentations/releases/tag/${version}"; + changelog = "https://github.com/albumentations-team/albumentations/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 3bcf99a4abf5..bcf7f40062c8 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -17,7 +17,6 @@ yapf, # dependencies - cloudpickle, crcmod, dill, fastavro, @@ -63,14 +62,14 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.63.0"; + version = "2.65.0"; pyproject = true; src = fetchFromGitHub { owner = "apache"; repo = "beam"; tag = "v${version}"; - hash = "sha256-ixJstawgU3UGtNKVzkwMCLkdY7QKTbxNe6JJ7vG+vmA="; + hash = "sha256-vDW0PVNep+egIZBe4t8IPwLgsQDmoO4rrA4wUoAHzfg="; }; pythonRelaxDeps = [ @@ -109,7 +108,6 @@ buildPythonPackage rec { ]; dependencies = [ - cloudpickle crcmod dill fastavro diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index c90adc544109..69ba771631ce 100644 --- a/pkgs/development/python-modules/argilla/default.nix +++ b/pkgs/development/python-modules/argilla/default.nix @@ -9,7 +9,6 @@ buildPythonPackage, cleanlab, datasets, - deprecated, elasticsearch8, evaluate, factory-boy, @@ -28,9 +27,10 @@ packaging, pandas, passlib, - setuptools, + pdm-backend, peft, pgmpy, + pillow, plotly, prodict, psutil, @@ -53,6 +53,7 @@ spacy-transformers, spacy, sqlalchemy, + standardwebhooks, tqdm, transformers, typer, @@ -67,16 +68,16 @@ buildPythonPackage rec { pname = "argilla"; - version = "2.6.0"; + version = "2.8.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "argilla-io"; repo = "argilla"; tag = "v${version}"; - hash = "sha256-2e2AIhrCJoPDn6EnO4IGSd2YNV/iSY39nmzbcHNwtOU="; + hash = "sha256-8j7/Gtn4FnAZA3oIV7dLxKwNtigqB7AweHtQ/kzLwm4="; }; sourceRoot = "${src.name}/${pname}"; @@ -89,21 +90,23 @@ buildPythonPackage rec { "wrapt" ]; - build-system = [ setuptools ]; + build-system = [ pdm-backend ]; dependencies = [ httpx - deprecated + datasets packaging pandas pydantic wrapt numpy tqdm - backoff + pillow + huggingface-hub monotonic rich typer + standardwebhooks ]; optional-dependencies = { @@ -112,6 +115,7 @@ buildPythonPackage rec { aiofiles aiosqlite alembic + backoff brotli-asgi elasticsearch8 fastapi @@ -142,11 +146,9 @@ buildPythonPackage rec { ]; integrations = [ cleanlab - datasets evaluate faiss flyingsquid - huggingface-hub openai peft pgmpy diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix index b34b1c46c1ad..0ab5b86e94c9 100644 --- a/pkgs/development/python-modules/atenpdu/default.nix +++ b/pkgs/development/python-modules/atenpdu/default.nix @@ -39,5 +39,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "pductl"; + broken = versionAtLeast pysnmp.version "7"; }; } diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index fae1cf96cc82..554b317c273d 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "3.3.0"; + version = "3.4.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BEkJzmO3et9XOd5A4vYhRzRT6dS9uRPvLRTBhaRTLOc="; + hash = "sha256-5fqIcyu8+1Q37lVOGPhCqPbIa+c2VrBYDuFG/Tcxdsk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix index 61a65025bf79..00ec94cf771a 100644 --- a/pkgs/development/python-modules/cloudpathlib/default.nix +++ b/pkgs/development/python-modules/cloudpathlib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "cloudpathlib"; - version = "0.21.0"; + version = "0.21.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "drivendataorg"; repo = "cloudpathlib"; tag = "v${version}"; - hash = "sha256-sChYdXltPPQ5XP7obY5EoMz/dq3fHQ3FqI0w8noEI+4="; + hash = "sha256-Bhr92xMK/WV3u0SG8q9SvO0kGnwSVXHzq6lK/RD2ssk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix index 57831c87e135..af0c9fee6d10 100644 --- a/pkgs/development/python-modules/commitizen/default.nix +++ b/pkgs/development/python-modules/commitizen/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "commitizen"; - version = "4.7.0"; + version = "4.7.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "commitizen-tools"; repo = "commitizen"; tag = "v${version}"; - hash = "sha256-fCQtSzOUezd3UE8bktn2cw4qwnl2pM6L7bBgKKFq5AM="; + hash = "sha256-SSj9K1ujwi/KNzugB0mIo0VMOz3WbCQ6X07ztB0JJsU="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/django-admin-sortable2/default.nix b/pkgs/development/python-modules/django-admin-sortable2/default.nix index 3687449e4b8e..001f807f1c09 100644 --- a/pkgs/development/python-modules/django-admin-sortable2/default.nix +++ b/pkgs/development/python-modules/django-admin-sortable2/default.nix @@ -9,13 +9,13 @@ }: let pname = "django-admin-sortable2"; - version = "2.2.6"; + version = "2.2.8"; src = fetchFromGitHub { owner = "jrief"; repo = "django-admin-sortable2"; tag = version; - hash = "sha256-MIxZ33Q8dHo102zvQqMiOlxtPjkenQQYTRyXJOHdCqE="; + hash = "sha256-T5dppM/o305GCg5uU7re/FdjhXFUyiH/DO2JTVf6Xgg="; }; assets = buildNpmPackage { @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = { description = "Generic drag-and-drop ordering for objects in the Django admin interface"; homepage = "https://github.com/jrief/django-admin-sortable2"; - changelog = "https://github.com/jrief/django-admin-sortable2/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/jrief/django-admin-sortable2/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sephi ]; }; diff --git a/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix index 195491ec8ab6..ab515a234fa1 100644 --- a/pkgs/development/python-modules/fastbencode/default.nix +++ b/pkgs/development/python-modules/fastbencode/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "fastbencode"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-X+DLfRc2iRr2HSreQM6UiUHUbpCLFvU4P1XxJ4SNoZc="; + hash = "sha256-o0wyxQSw7J3hpJk0btJJMjWetGI0sotwl1pQ/fqhSrU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 5923ce6ad2a4..201460b18868 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "gspread"; - version = "6.2.0"; + version = "6.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "burnash"; repo = "gspread"; tag = "v${version}"; - hash = "sha256-DTKSH8FtzOXlB7TzNqahDm8PY3ZarpZg8GYQ1kcdfdg="; + hash = "sha256-j7UNti5N8c1mjw+1qTPIRCWJ6M4Ur0P9sG1uJnp170M="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/hyperscan/default.nix b/pkgs/development/python-modules/hyperscan/default.nix index b2b16464db70..29b3435df72e 100644 --- a/pkgs/development/python-modules/hyperscan/default.nix +++ b/pkgs/development/python-modules/hyperscan/default.nix @@ -23,14 +23,14 @@ let in buildPythonPackage rec { pname = "hyperscan"; - version = "0.7.9"; + version = "0.7.13"; pyproject = true; src = fetchFromGitHub { owner = "darvid"; repo = "python-hyperscan"; tag = "v${version}"; - hash = "sha256-tf3dQgY0p+J6GIS8pB3+kvomNVYcbMJ+72T8IVbrnrU="; + hash = "sha256-l97UXuM37WK3XRSoIfQzobkM+3WYp6JUtemn/28mMNk="; }; env.CMAKE_ARGS = "-DHS_SRC_ROOT=${pkgs.hyperscan.src} -DHS_BUILD_LIB_ROOT=${lib-deps}/lib"; diff --git a/pkgs/development/python-modules/iterfzf/default.nix b/pkgs/development/python-modules/iterfzf/default.nix index 83b6cb5c0077..ab25c02a5852 100644 --- a/pkgs/development/python-modules/iterfzf/default.nix +++ b/pkgs/development/python-modules/iterfzf/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "iterfzf"; - version = "1.6.0.60.3"; + version = "1.8.0.62.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "dahlia"; repo = "iterfzf"; tag = version; - hash = "sha256-M6ri90GNHOmr0HtQ/tGxqpG7f+D5rsH/SAlbaVtmTwU="; + hash = "sha256-eLgF+9p+sqxWR1VkSoeL0NPDMamzUYbql4gMeG8fyNY="; }; postPatch = '' @@ -53,11 +53,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "iterfzf" ]; - meta = with lib; { + meta = { description = "Pythonic interface to fzf, a CLI fuzzy finder"; homepage = "https://github.com/dahlia/iterfzf"; changelog = "https://github.com/dahlia/iterfzf/releases/tag/${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix b/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix index 7c3b703a4d96..114962dada89 100644 --- a/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { # no tests doCheck = false; - passthru.tests = jupyter-collaboration.tests; + passthru.tests = jupyter-collaboration; meta = { description = "JupyterLab/Jupyter Notebook 7+ extension providing user interface integration for real time collaboration"; diff --git a/pkgs/development/python-modules/jupyter-collaboration/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix index 49f2aeea1a78..dace73df26e3 100644 --- a/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, # build-system hatchling, @@ -10,36 +10,59 @@ jupyter-collaboration-ui, jupyter-docprovider, jupyter-server-ydoc, + jupyterlab, # tests - callPackage, + dirty-equals, + httpx-ws, + pytest-jupyter, + pytest-timeout, + pytestCheckHook, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "jupyter-collaboration"; - version = "3.1.0"; + version = "4.0.2"; pyproject = true; - src = fetchPypi { - pname = "jupyter_collaboration"; - inherit version; - hash = "sha256-BDmG5vzdikFh342XFqk92q/smidKqbUDWEx6gORh7p8="; + src = fetchFromGitHub { + owner = "jupyterlab"; + repo = "jupyter-collaboration"; + tag = "v${version}"; + hash = "sha256-BCvTtrlP45YC9G/m/e8Nvbls7AugIaQzO2Gect1EmGE="; }; + sourceRoot = "${src.name}/projects/jupyter-collaboration"; + build-system = [ hatchling ]; dependencies = [ jupyter-collaboration-ui jupyter-docprovider jupyter-server-ydoc + jupyterlab ]; pythonImportsCheck = [ "jupyter_collaboration" ]; - # no tests - doCheck = false; + nativeCheckInputs = [ + dirty-equals + httpx-ws + pytest-jupyter + pytest-timeout + pytestCheckHook + writableTmpDirAsHomeHook + ]; + + pytestFlagsArray = [ + # pytest.PytestCacheWarning: could not create cache path /build/source/.pytest_cache/v/cache/nodeids: [Errno 13] Permission denied: '/build/source/pytest-cache-files-plraagdr' + "-p" + "no:cacheprovider" + "$src/tests" + ]; - passthru.tests = callPackage ./test.nix { }; + __darwinAllowLocalNetworking = true; meta = { description = "JupyterLab Extension enabling Real-Time Collaboration"; diff --git a/pkgs/development/python-modules/jupyter-collaboration/test.nix b/pkgs/development/python-modules/jupyter-collaboration/test.nix deleted file mode 100644 index 044b923a723d..000000000000 --- a/pkgs/development/python-modules/jupyter-collaboration/test.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - stdenvNoCC, - fetchFromGitHub, - jupyter-collaboration, - pytest-jupyter, - pytestCheckHook, - websockets, -}: -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "jupyter-collaboration-test"; - inherit (jupyter-collaboration) version; - - src = fetchFromGitHub { - owner = "jupyterlab"; - repo = "jupyter-collaboration"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-6hDYB1uC0WraB37s9EKLJF7jyFu0B3xLocuLYyKj4hs="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "timeout = 300" "" - ''; - - installPhase = '' - touch $out - ''; - - env.HOME = "$TMPDIR"; - - doCheck = true; - - nativeCheckInputs = [ - jupyter-collaboration - pytest-jupyter - pytestCheckHook - websockets - ]; -}) diff --git a/pkgs/development/python-modules/jupyter-docprovider/default.nix b/pkgs/development/python-modules/jupyter-docprovider/default.nix index 2d92623c3761..834b1b63ebda 100644 --- a/pkgs/development/python-modules/jupyter-docprovider/default.nix +++ b/pkgs/development/python-modules/jupyter-docprovider/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "jupyter-docprovider"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; src = fetchPypi { pname = "jupyter_docprovider"; inherit version; - hash = "sha256-4pyF5HDQ7dP32R+O3QN8DWtvJpQxBBbjWXaRAfs10b4="; + hash = "sha256-vWgNlg6Ydw4va3DlEx3A/M9uE0t54GTrV1ljmlX44TU="; }; postPatch = '' @@ -33,7 +33,7 @@ buildPythonPackage rec { # no tests doCheck = false; - passthru.tests = jupyter-collaboration.tests; + passthru.tests = jupyter-collaboration; meta = { description = "JupyterLab/Jupyter Notebook 7+ extension integrating collaborative shared models"; diff --git a/pkgs/development/python-modules/jupyter-server-ydoc/default.nix b/pkgs/development/python-modules/jupyter-server-ydoc/default.nix index d8e823355b32..fdf1a4cd95b6 100644 --- a/pkgs/development/python-modules/jupyter-server-ydoc/default.nix +++ b/pkgs/development/python-modules/jupyter-server-ydoc/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { # no tests doCheck = false; - passthru.tests = jupyter-collaboration.tests; + passthru.tests = jupyter-collaboration; meta = { description = "Jupyter-server extension integrating collaborative shared models"; diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 95308ed3bab6..fa332452fbbd 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -111,6 +111,8 @@ buildPythonPackage rec { disabledTests = [ # requires bs4, aka BeautifulSoup "test_importable_all" + # flaky + "test_llm_caching_async" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix index 532d7079bed1..537520d435ee 100644 --- a/pkgs/development/python-modules/langchain-openai/default.nix +++ b/pkgs/development/python-modules/langchain-openai/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "langchain-openai"; - version = "0.3.16"; + version = "0.3.17"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-openai==${version}"; - hash = "sha256-e8y5rL+OUFOAPfXTC+XHn/wVfsecPInsS8hBxm1USAw="; + hash = "sha256-JsPdG62vvM8b/u5bo6FyXQhhGua/Sd74L/8CtMI7Fjc="; }; sourceRoot = "${src.name}/libs/partners/openai"; diff --git a/pkgs/development/python-modules/mlxtend/0001-StackingCVClassifier-fit-ensure-compatibility-with-s.patch b/pkgs/development/python-modules/mlxtend/0001-StackingCVClassifier-fit-ensure-compatibility-with-s.patch new file mode 100644 index 000000000000..2d807ef2c2e0 --- /dev/null +++ b/pkgs/development/python-modules/mlxtend/0001-StackingCVClassifier-fit-ensure-compatibility-with-s.patch @@ -0,0 +1,80 @@ +From 1fb59eb42f4bef229b953de313c7e78f0857ea42 Mon Sep 17 00:00:00 2001 +From: Philip Wilk <p.wilk@student.reading.ac.uk> +Date: Sun, 23 Mar 2025 16:14:51 +0000 +Subject: [PATCH] StackingCVClassifier/fit: ensure compatibility with + *scikit-learn* versions 1.4 and above by dynamically selecting between + `fit_params` and `params` + +--- + mlxtend/classifier/stacking_cv_classification.py | 5 ++++- + mlxtend/regressor/stacking_cv_regression.py | 6 +++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/mlxtend/classifier/stacking_cv_classification.py b/mlxtend/classifier/stacking_cv_classification.py +index 5bff6907..f4c45b8c 100644 +--- a/mlxtend/classifier/stacking_cv_classification.py ++++ b/mlxtend/classifier/stacking_cv_classification.py +@@ -15,6 +15,7 @@ from sklearn.base import TransformerMixin, clone + from sklearn.model_selection import cross_val_predict + from sklearn.model_selection._split import check_cv + from sklearn.preprocessing import LabelEncoder ++from sklearn import __version__ as sklearn_version + + from ..externals.estimator_checks import check_is_fitted + from ..externals.name_estimators import _name_estimators +@@ -266,6 +267,8 @@ class StackingCVClassifier( + if self.verbose > 1: + print(_name_estimators((model,))[0][1]) + ++ param_name = "fit_params" if sklearn_version < "1.4" else "params" ++ + prediction = cross_val_predict( + model, + X, +@@ -273,10 +276,10 @@ class StackingCVClassifier( + groups=groups, + cv=final_cv, + n_jobs=self.n_jobs, +- fit_params=fit_params, + verbose=self.verbose, + pre_dispatch=self.pre_dispatch, + method="predict_proba" if self.use_probas else "predict", ++ **{param_name: fit_params}, + ) + + if not self.use_probas: +diff --git a/mlxtend/regressor/stacking_cv_regression.py b/mlxtend/regressor/stacking_cv_regression.py +index a1faf2ff..d2fb1c49 100644 +--- a/mlxtend/regressor/stacking_cv_regression.py ++++ b/mlxtend/regressor/stacking_cv_regression.py +@@ -19,6 +19,7 @@ from sklearn.base import RegressorMixin, TransformerMixin, clone + from sklearn.model_selection import cross_val_predict + from sklearn.model_selection._split import check_cv + from sklearn.utils import check_X_y ++from sklearn import __version__ as sklearn_version + + from ..externals.estimator_checks import check_is_fitted + from ..externals.name_estimators import _name_estimators +@@ -211,6 +212,9 @@ class StackingCVRegressor(_BaseXComposition, RegressorMixin, TransformerMixin): + fit_params = None + else: + fit_params = dict(sample_weight=sample_weight) ++ ++ param_name = "fit_params" if sklearn_version < "1.4" else "params" ++ + meta_features = np.column_stack( + [ + cross_val_predict( +@@ -221,8 +225,8 @@ class StackingCVRegressor(_BaseXComposition, RegressorMixin, TransformerMixin): + cv=kfold, + verbose=self.verbose, + n_jobs=self.n_jobs, +- fit_params=fit_params, + pre_dispatch=self.pre_dispatch, ++ **{param_name: fit_params}, + ) + for regr in self.regr_ + ] +-- +2.47.1 + diff --git a/pkgs/development/python-modules/mlxtend/0001-fix-test-replace-np.float_-to-np.float64.patch b/pkgs/development/python-modules/mlxtend/0001-fix-test-replace-np.float_-to-np.float64.patch deleted file mode 100644 index c196d2bb5035..000000000000 --- a/pkgs/development/python-modules/mlxtend/0001-fix-test-replace-np.float_-to-np.float64.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 360cb75317aecaf6b9abcf24f0577afef75c464e Mon Sep 17 00:00:00 2001 -From: wxt <3264117476@qq.com> -Date: Mon, 6 Jan 2025 20:41:27 +0800 -Subject: [PATCH] fix(test): replace np.float_ to np.float64 - ---- - mlxtend/_base/_regressor.py | 2 +- - mlxtend/_base/tests/test_classifier.py | 2 +- - mlxtend/_base/tests/test_cluster.py | 2 +- - mlxtend/classifier/multilayerperceptron.py | 2 +- - mlxtend/classifier/softmax_regression.py | 2 +- - mlxtend/math/linalg.py | 2 +- - mlxtend/plotting/tests/test_decision_regions.py | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/mlxtend/_base/_regressor.py b/mlxtend/_base/_regressor.py -index e3d0a1d..1d3a5d6 100644 ---- a/mlxtend/_base/_regressor.py -+++ b/mlxtend/_base/_regressor.py -@@ -16,7 +16,7 @@ class _Regressor(object): - pass - - def _check_target_array(self, y, allowed=None): -- if not isinstance(y[0], (float, np.float_)): -+ if not isinstance(y[0], (float, np.float64)): - raise AttributeError("y must be a float array.\nFound %s" % y.dtype) - - def fit(self, X, y, init_params=True): -diff --git a/mlxtend/_base/tests/test_classifier.py b/mlxtend/_base/tests/test_classifier.py -index f77f74d..1bbac6d 100644 ---- a/mlxtend/_base/tests/test_classifier.py -+++ b/mlxtend/_base/tests/test_classifier.py -@@ -51,7 +51,7 @@ def test_check_labels_not_ok_1(): - - - def test_check_labels_integer_notok(): -- y = np.array([1.0, 2.0], dtype=np.float_) -+ y = np.array([1.0, 2.0], dtype=np.float64) - cl = BlankClassifier(print_progress=0, random_seed=1) - with pytest.raises(AttributeError) as excinfo: - cl._check_target_array(y) -diff --git a/mlxtend/_base/tests/test_cluster.py b/mlxtend/_base/tests/test_cluster.py -index 6da1a9d..54c2526 100644 ---- a/mlxtend/_base/tests/test_cluster.py -+++ b/mlxtend/_base/tests/test_cluster.py -@@ -51,7 +51,7 @@ def test_check_labels_not_ok_1(): - - - def test_check_labels_integer_notok(): -- y = np.array([1.0, 2.0], dtype=np.float_) -+ y = np.array([1.0, 2.0], dtype=np.float64) - cl = BlankClassifier(print_progress=0, random_seed=1) - with pytest.raises(AttributeError) as excinfo: - cl._check_target_array(y) -diff --git a/mlxtend/classifier/multilayerperceptron.py b/mlxtend/classifier/multilayerperceptron.py -index 770dab9..05416c3 100644 ---- a/mlxtend/classifier/multilayerperceptron.py -+++ b/mlxtend/classifier/multilayerperceptron.py -@@ -143,7 +143,7 @@ class MultiLayerPerceptron( - prev_grad_b_out = np.zeros(shape=self.b_["out"].shape) - prev_grad_w_out = np.zeros(shape=self.w_["out"].shape) - -- y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float_) -+ y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float64) - - self.init_time_ = time() - -diff --git a/mlxtend/classifier/softmax_regression.py b/mlxtend/classifier/softmax_regression.py -index 56444e5..173154e 100644 ---- a/mlxtend/classifier/softmax_regression.py -+++ b/mlxtend/classifier/softmax_regression.py -@@ -141,7 +141,7 @@ class SoftmaxRegression(_BaseModel, _IterativeModel, _Classifier, _MultiClass): - ) - self.cost_ = [] - -- y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float_) -+ y_enc = self._one_hot(y=y, n_labels=self.n_classes, dtype=np.float64) - - self.init_time_ = time() - rgen = np.random.RandomState(self.random_seed) -diff --git a/mlxtend/math/linalg.py b/mlxtend/math/linalg.py -index 02600f1..ece4c3c 100644 ---- a/mlxtend/math/linalg.py -+++ b/mlxtend/math/linalg.py -@@ -45,7 +45,7 @@ def vectorspace_orthonormalization(ary, eps=1e-13): # method='gram-schmidt', - # 2c) Normalize if linearly independent, - # and set to zero otherwise - -- arr = ary.astype(np.float_).copy() -+ arr = ary.astype(np.float64).copy() - - for i in range(arr.shape[1]): - for j in range(i): -diff --git a/mlxtend/plotting/tests/test_decision_regions.py b/mlxtend/plotting/tests/test_decision_regions.py -index fba2255..aad63ff 100644 ---- a/mlxtend/plotting/tests/test_decision_regions.py -+++ b/mlxtend/plotting/tests/test_decision_regions.py -@@ -94,7 +94,7 @@ def test_y_int_ary(): - "Try passing the array as y.astype(np.int_)", - plot_decision_regions, - X[:, :2], -- y.astype(np.float_), -+ y.astype(np.float64), - sr, - ) - --- -2.47.0 - diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 87f82295d1e8..db5689580279 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mlxtend"; - version = "0.23.3"; + version = "0.23.4"; pyproject = true; disabled = isPy27; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "rasbt"; repo = "mlxtend"; tag = "v${version}"; - hash = "sha256-c6I0dwu4y/Td2G6m2WP/52W4noQUmQMDvpzXA9RZauo="; + hash = "sha256-xoAHYRmqN5SrEWlc18ntTZ6WAznBlVZdf+x5Yev3ysE="; }; build-system = [ setuptools ]; @@ -39,8 +39,8 @@ buildPythonPackage rec { ]; patches = [ - # https://github.com/rasbt/mlxtend/pull/1119 - ./0001-fix-test-replace-np.float_-to-np.float64.patch + # https://github.com/rasbt/mlxtend/issues/1117 + ./0001-StackingCVClassifier-fit-ensure-compatibility-with-s.patch ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -59,6 +59,10 @@ buildPythonPackage rec { "mlxtend/evaluate/tests/test_feature_importance.py" # urlopen error "mlxtend/evaluate/tests/test_bias_variance_decomp.py" # keras.api._v2 "mlxtend/evaluate/tests/test_bootstrap_point632.py" # keras.api._v2 + # Failing tests, most likely an upstream issue. See https://github.com/rasbt/mlxtend/issues/1117 + "mlxtend/classifier/tests/test_ensemble_vote_classifier.py" + "mlxtend/classifier/tests/test_stacking_classifier.py" + "mlxtend/classifier/tests/test_stacking_cv_classifier.py" ]; meta = { diff --git a/pkgs/development/python-modules/otpauth/default.nix b/pkgs/development/python-modules/otpauth/default.nix index 40ac405462ae..e3d43c8e0515 100644 --- a/pkgs/development/python-modules/otpauth/default.nix +++ b/pkgs/development/python-modules/otpauth/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "otpauth"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-Ev2uZNBmT/v6/a39weyP5XGs0OcaYveSM9072giNOcI="; + hash = "sha256-Fpp629cV/KaH9qZtAszb78Ip+0n4pjS5WNKG+QgTTVk="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index d2034dc13b56..0bf6692537e4 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyathena"; - version = "3.13.0"; + version = "3.14.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-kzyV/y3xuf3tOMkL1SwkUCvG/I/1eQneTBUG/xbTbLA="; + hash = "sha256-Dgst0gFmHsQwhScz83cIE7B1xbcSKcYslfCGtm3yuh0="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pynitrokey/default.nix b/pkgs/development/python-modules/pynitrokey/default.nix index cd99131143f0..1852360f7324 100644 --- a/pkgs/development/python-modules/pynitrokey/default.nix +++ b/pkgs/development/python-modules/pynitrokey/default.nix @@ -30,7 +30,7 @@ let pname = "pynitrokey"; - version = "0.8.1"; + version = "0.8.3"; mainProgram = "nitropy"; in @@ -40,7 +40,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-HLqT4r0ljRU5TYRJuBJvt9tF0igxaerUEPobyzWLCO8="; + hash = "sha256-GPg034MhJLROSERWasZyvklckLICBI6XWMTLC++nX4g="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/python-modules/pystatgrab/default.nix b/pkgs/development/python-modules/pystatgrab/default.nix index 620552507729..904de7a783ca 100644 --- a/pkgs/development/python-modules/pystatgrab/default.nix +++ b/pkgs/development/python-modules/pystatgrab/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, cython, fetchFromGitHub, @@ -8,7 +9,6 @@ pythonOlder, setuptools, unittestCheckHook, - wheel, }: buildPythonPackage rec { @@ -25,24 +25,22 @@ buildPythonPackage rec { hash = "sha256-0FDhkIK8jy3/SFmCzrl9l4RTeIKDjO0o5UoODx6Wnfs="; }; - build-system = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; nativeBuildInputs = [ cython pkg-config ]; - buildInputs = [ - libstatgrab - ]; + buildInputs = [ libstatgrab ]; nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "statgrab" ]; + # Tests don't work on darwin due to seg fault + doCheck = !stdenv.hostPlatform.isDarwin; + meta = with lib; { description = "Python bindings for libstatgrab"; homepage = "https://github.com/libstatgrab/pystatgrab"; diff --git a/pkgs/development/python-modules/pytest-scim2-server/default.nix b/pkgs/development/python-modules/pytest-scim2-server/default.nix index cf591738c47d..f4256b2576ac 100644 --- a/pkgs/development/python-modules/pytest-scim2-server/default.nix +++ b/pkgs/development/python-modules/pytest-scim2-server/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytest-scim2-server"; - version = "0.1.3"; + version = "0.1.5"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pytest_scim2_server"; inherit version; - hash = "sha256-iZrKKUfbqAAhugSNhqiCy6mVBoXxa0yruiQzHg0pIDY="; + hash = "sha256-5jsjVtxiSF3cu9useDEmwQ45PqJAZmfw7OUIZkCi6gQ="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/sectxt/default.nix b/pkgs/development/python-modules/sectxt/default.nix index 186ffe143690..32c41fd0d026 100644 --- a/pkgs/development/python-modules/sectxt/default.nix +++ b/pkgs/development/python-modules/sectxt/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "sectxt"; - version = "0.9.6"; + version = "0.9.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "DigitalTrustCenter"; repo = "sectxt"; tag = version; - hash = "sha256-49YxhcOpi1wofKMRuNxt8esBtfaSoBrGu+yBCRFWZYY="; + hash = "sha256-CDVfT3ANb4ugLEvrSRTbkZMvZA6rcEwBu2c3pnjsza8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index 625619e9bd0a..728e669aae08 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -26,6 +26,7 @@ apache-beam, beautifulsoup4, click, + cloudpickle, datasets, ffmpeg, imagemagick, @@ -101,6 +102,7 @@ buildPythonPackage rec { apache-beam beautifulsoup4 click + cloudpickle datasets ffmpeg imagemagick @@ -136,6 +138,13 @@ buildPythonPackage rec { "--deselect=tensorflow_datasets/text/c4_wsrs/c4_wsrs_test.py::C4WSRSTest" ]; + disabledTests = [ + # Since updating apache-beam to 2.65.0 + # RuntimeError: Unable to pickle fn CallableWrapperDoFn...: maximum recursion depth exceeded + # https://github.com/tensorflow/datasets/issues/11055 + "test_download_and_prepare_as_dataset" + ]; + disabledTestPaths = [ # Sandbox violations: network access, filesystem write attempts outside of build dir, ... "tensorflow_datasets/core/dataset_builder_test.py" diff --git a/pkgs/development/python-modules/tree-sitter-language-pack/default.nix b/pkgs/development/python-modules/tree-sitter-language-pack/default.nix index c63bd83f8df0..2bdfbf2efca4 100644 --- a/pkgs/development/python-modules/tree-sitter-language-pack/default.nix +++ b/pkgs/development/python-modules/tree-sitter-language-pack/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchPypi, + python, + nix-update-script, # build-system cython, @@ -17,7 +19,7 @@ buildPythonPackage rec { pname = "tree-sitter-language-pack"; - version = "0.6.1"; + version = "0.7.3"; pyproject = true; # Using the GitHub sources necessitates fetching the treesitter grammar parsers by using a vendored script: @@ -26,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tree_sitter_language_pack"; inherit version; - hash = "sha256-pGNfW2ubZCVi2QHk6qJfyClJ1mDIi5R1Pm1GfZY0Ark="; + hash = "sha256-SROctgfYE1LTOtGOV1IPwQV6AJlVyczO1WYHzBjmo/0="; }; build-system = [ @@ -42,13 +44,41 @@ buildPythonPackage rec { tree-sitter-yaml ]; + prePatch = '' + # Remove the packaged bindings, which only work on Linux and prevent the build from succeeding + # https://github.com/Goldziher/tree-sitter-language-pack/issues/46 + rm -rf tree_sitter_language_pack/bindings/*.so + ''; + pythonImportsCheck = [ "tree_sitter_language_pack" "tree_sitter_language_pack.bindings" ]; - # No tests in the pypi archive - doCheck = false; + # No tests in the pypi archive, we add a test to check that all bindings can be imported + checkPhase = '' + runHook preCheck + + cat <<EOF > test-import-bindings.py + import sys + import os + if (cwd := os.getcwd()) in sys.path: + # remove current working directory from sys.path, use PYTHONPATH instead + sys.path.remove(cwd) + + from typing import get_args + from tree_sitter_language_pack import SupportedLanguage, get_binding + + for lang in get_args(SupportedLanguage): + get_binding(lang) + EOF + + ${python.interpreter} test-import-bindings.py + + runHook postCheck + ''; + + passthru.updateScript = nix-update-script { }; meta = { description = "Comprehensive collection of tree-sitter languages"; diff --git a/pkgs/development/python-modules/turrishw/default.nix b/pkgs/development/python-modules/turrishw/default.nix index 014c7b83f851..8f5378f6ef4e 100644 --- a/pkgs/development/python-modules/turrishw/default.nix +++ b/pkgs/development/python-modules/turrishw/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, hatchling, @@ -25,12 +26,15 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + # Tests don't work on darwin + doCheck = !stdenv.hostPlatform.isDarwin; + pythonImportsCheck = [ "turrishw" ]; meta = { description = "Python library and program for Turris hardware listing"; homepage = "https://github.com/turris-cz/turrishw"; - changelog = "https://github.com/turris-cz/turrishw/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/turris-cz/turrishw/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix index d534568d3714..137ce28a034e 100644 --- a/pkgs/development/python-modules/webexteamssdk/default.nix +++ b/pkgs/development/python-modules/webexteamssdk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "webexteamssdk"; - version = "2.0.3"; + version = "1.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,9 +22,13 @@ buildPythonPackage rec { owner = "CiscoDevNet"; repo = "webexteamssdk"; tag = "v${version}"; - hash = "sha256-E66LwqzNWYAxnB8y5t8JHH4oVVXvheO7tteHWqrRRt8="; + hash = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo="; }; + # opsdroid still depends on webexteamssdk but package was renamed + # to webexpythonsdk + passthru.skipBulkUpdate = true; + postPatch = '' # Remove vendorized versioneer rm versioneer.py @@ -50,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for Webex Teams APIs"; homepage = "https://github.com/CiscoDevNet/webexteamssdk"; - changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/${src.tag}"; + changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/whisperx/default.nix b/pkgs/development/python-modules/whisperx/default.nix index c97e62afe913..e08506532d80 100644 --- a/pkgs/development/python-modules/whisperx/default.nix +++ b/pkgs/development/python-modules/whisperx/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -71,7 +72,12 @@ buildPythonPackage rec { # This has been updated on main, so we expect this clause to be removed upon the next update. pythonRelaxDeps = [ "faster-whisper" ]; - pythonImportsCheck = [ "whisperx" ]; + # Import check fails due on `aarch64-linux` ONLY in the sandbox due to onnxruntime + # not finding its default logger, which then promptly segfaults. + # Simply run the import check on every other platform instead. + pythonImportsCheck = lib.optionals ( + !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) + ) [ "whisperx" ]; # No tests in repository doCheck = false; |
