diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index f13ce79961f7..645b3b76c92f 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -31,6 +31,7 @@ protobuf, pyarrow, pydot, + pymilvus, pymongo, python-dateutil, pytz, @@ -62,16 +63,27 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.66.0"; + version = "2.67.0"; pyproject = true; src = fetchFromGitHub { owner = "apache"; repo = "beam"; tag = "v${version}"; - hash = "sha256-nRofy9pvhO5SUvkIk73ViFm1gPWxEhj1rAUeCVYIpYs="; + hash = "sha256-gHlbmPNtSKjYO4YPPtWnjul977APsHwe/2cq2UG4wuk="; }; + sourceRoot = "${src.name}/sdks/python"; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "==" ">=" \ + --replace-fail ",<2.3.0" "" + + substituteInPlace setup.py \ + --replace-fail " copy_tests_from_docs()" "" + ''; + pythonRelaxDeps = [ "grpcio" "jsonpickle" @@ -95,8 +107,6 @@ buildPythonPackage rec { "redis" ]; - sourceRoot = "${src.name}/sdks/python"; - build-system = [ cython distlib @@ -125,6 +135,7 @@ buildPythonPackage rec { protobuf pyarrow pydot + pymilvus pymongo python-dateutil pytz @@ -136,18 +147,6 @@ buildPythonPackage rec { enableParallelBuilding = true; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "distlib==0.3.7" "distlib" \ - --replace-fail "yapf==0.29.0" "yapf" \ - --replace-fail "grpcio-tools==1.62.1" "grpcio-tools" \ - --replace-fail "mypy-protobuf==3.5.0" "mypy-protobuf" \ - --replace-fail "numpy>=1.14.3,<2.3.0" "numpy" - - substituteInPlace setup.py \ - --replace-fail " copy_tests_from_docs()" "" - ''; - __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "apache_beam" ]; @@ -178,6 +177,14 @@ buildPythonPackage rec { ''; disabledTestPaths = [ + # FileNotFoundError: [Errno 2] No such file or directory: + # '/nix/store/...-python3.13-apache-beam-2.67.0/lib/python3.13/site-packages/apache_beam/yaml/docs/yaml.md' + "apache_beam/yaml/examples/testing/examples_test.py" + + # from google.cloud.sql.connector import Connector + # E ModuleNotFoundError: No module named 'google.cloud' + "apache_beam/ml/rag/ingestion/cloudsql_it_test.py" + # Fails with # _______ ERROR collecting apache_beam/io/external/xlang_jdbcio_it_test.py _______ # apache_beam/io/external/xlang_jdbcio_it_test.py:80: in @@ -339,6 +346,10 @@ buildPythonPackage rec { ]; disabledTests = [ + # fixture 'self' not found + "test_with_batched_input_exceeds_size_limit" + "test_with_batched_input_splits_large_batch" + # IndexError: list index out of range "test_only_sample_exceptions" diff --git a/pkgs/development/python-modules/mlcroissant/default.nix b/pkgs/development/python-modules/mlcroissant/default.nix index 510c7d617ace..b4512f183a16 100644 --- a/pkgs/development/python-modules/mlcroissant/default.nix +++ b/pkgs/development/python-modules/mlcroissant/default.nix @@ -22,6 +22,7 @@ # tests apache-beam, gitpython, + librosa, pillow, pytestCheckHook, pyyaml, @@ -30,14 +31,14 @@ buildPythonPackage rec { pname = "mlcroissant"; - version = "1.0.21"; + version = "1.0.22"; pyproject = true; src = fetchFromGitHub { owner = "mlcommons"; repo = "croissant"; tag = "v${version}"; - hash = "sha256-yUAF/NQHz8WUIaIIsqOwTMppl5+EZhURFpHnde9OOpE="; + hash = "sha256-uJOxKNrK3eN2wyPFEQr2J4+vZeSK1KPyFDag2jcyWZw="; }; sourceRoot = "${src.name}/python/mlcroissant"; @@ -66,6 +67,7 @@ buildPythonPackage rec { nativeCheckInputs = [ apache-beam gitpython + librosa pillow pytestCheckHook pyyaml