Skip to content

Commit 5deebb9

Browse files
authored
python3Packages.apache-beam: 2.66.0 -> 2.67.0 (#437683)
2 parents 6c8a33d + 8513ff6 commit 5deebb9

File tree

2 files changed

+31
-18
lines changed

2 files changed

+31
-18
lines changed

pkgs/development/python-modules/apache-beam/default.nix

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
protobuf,
3232
pyarrow,
3333
pydot,
34+
pymilvus,
3435
pymongo,
3536
python-dateutil,
3637
pytz,
@@ -62,16 +63,27 @@
6263

6364
buildPythonPackage rec {
6465
pname = "apache-beam";
65-
version = "2.66.0";
66+
version = "2.67.0";
6667
pyproject = true;
6768

6869
src = fetchFromGitHub {
6970
owner = "apache";
7071
repo = "beam";
7172
tag = "v${version}";
72-
hash = "sha256-nRofy9pvhO5SUvkIk73ViFm1gPWxEhj1rAUeCVYIpYs=";
73+
hash = "sha256-gHlbmPNtSKjYO4YPPtWnjul977APsHwe/2cq2UG4wuk=";
7374
};
7475

76+
sourceRoot = "${src.name}/sdks/python";
77+
78+
postPatch = ''
79+
substituteInPlace pyproject.toml \
80+
--replace-fail "==" ">=" \
81+
--replace-fail ",<2.3.0" ""
82+
83+
substituteInPlace setup.py \
84+
--replace-fail " copy_tests_from_docs()" ""
85+
'';
86+
7587
pythonRelaxDeps = [
7688
"grpcio"
7789
"jsonpickle"
@@ -95,8 +107,6 @@ buildPythonPackage rec {
95107
"redis"
96108
];
97109

98-
sourceRoot = "${src.name}/sdks/python";
99-
100110
build-system = [
101111
cython
102112
distlib
@@ -125,6 +135,7 @@ buildPythonPackage rec {
125135
protobuf
126136
pyarrow
127137
pydot
138+
pymilvus
128139
pymongo
129140
python-dateutil
130141
pytz
@@ -136,18 +147,6 @@ buildPythonPackage rec {
136147

137148
enableParallelBuilding = true;
138149

139-
postPatch = ''
140-
substituteInPlace pyproject.toml \
141-
--replace-fail "distlib==0.3.7" "distlib" \
142-
--replace-fail "yapf==0.29.0" "yapf" \
143-
--replace-fail "grpcio-tools==1.62.1" "grpcio-tools" \
144-
--replace-fail "mypy-protobuf==3.5.0" "mypy-protobuf" \
145-
--replace-fail "numpy>=1.14.3,<2.3.0" "numpy"
146-
147-
substituteInPlace setup.py \
148-
--replace-fail " copy_tests_from_docs()" ""
149-
'';
150-
151150
__darwinAllowLocalNetworking = true;
152151

153152
pythonImportsCheck = [ "apache_beam" ];
@@ -178,6 +177,14 @@ buildPythonPackage rec {
178177
'';
179178

180179
disabledTestPaths = [
180+
# FileNotFoundError: [Errno 2] No such file or directory:
181+
# '/nix/store/...-python3.13-apache-beam-2.67.0/lib/python3.13/site-packages/apache_beam/yaml/docs/yaml.md'
182+
"apache_beam/yaml/examples/testing/examples_test.py"
183+
184+
# from google.cloud.sql.connector import Connector
185+
# E ModuleNotFoundError: No module named 'google.cloud'
186+
"apache_beam/ml/rag/ingestion/cloudsql_it_test.py"
187+
181188
# Fails with
182189
# _______ ERROR collecting apache_beam/io/external/xlang_jdbcio_it_test.py _______
183190
# apache_beam/io/external/xlang_jdbcio_it_test.py:80: in <module>
@@ -339,6 +346,10 @@ buildPythonPackage rec {
339346
];
340347

341348
disabledTests = [
349+
# fixture 'self' not found
350+
"test_with_batched_input_exceeds_size_limit"
351+
"test_with_batched_input_splits_large_batch"
352+
342353
# IndexError: list index out of range
343354
"test_only_sample_exceptions"
344355

pkgs/development/python-modules/mlcroissant/default.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
# tests
2323
apache-beam,
2424
gitpython,
25+
librosa,
2526
pillow,
2627
pytestCheckHook,
2728
pyyaml,
@@ -30,14 +31,14 @@
3031

3132
buildPythonPackage rec {
3233
pname = "mlcroissant";
33-
version = "1.0.21";
34+
version = "1.0.22";
3435
pyproject = true;
3536

3637
src = fetchFromGitHub {
3738
owner = "mlcommons";
3839
repo = "croissant";
3940
tag = "v${version}";
40-
hash = "sha256-yUAF/NQHz8WUIaIIsqOwTMppl5+EZhURFpHnde9OOpE=";
41+
hash = "sha256-uJOxKNrK3eN2wyPFEQr2J4+vZeSK1KPyFDag2jcyWZw=";
4142
};
4243

4344
sourceRoot = "${src.name}/python/mlcroissant";
@@ -66,6 +67,7 @@ buildPythonPackage rec {
6667
nativeCheckInputs = [
6768
apache-beam
6869
gitpython
70+
librosa
6971
pillow
7072
pytestCheckHook
7173
pyyaml

0 commit comments

Comments
 (0)