From 197c12d4da453fbe9d650000f9e36cf224a41790 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Thu, 14 Jul 2022 18:31:28 +0200
Subject: python310Packages.apache-beam: 2.37.0 -> 2.40.0

---
 .../python-modules/apache-beam/default.nix         | 35 ++++++++++++----------
 1 file changed, 20 insertions(+), 15 deletions(-)

(limited to 'pkgs/development/python-modules/apache-beam')

diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix
index e3545ee0e6dd0..17e5389a5bbca 100644
--- a/pkgs/development/python-modules/apache-beam/default.nix
+++ b/pkgs/development/python-modules/apache-beam/default.nix
@@ -5,7 +5,6 @@
 , dill
 , fastavro
 , fetchFromGitHub
-, fetchpatch
 , freezegun
 , grpcio
 , grpcio-tools
@@ -38,35 +37,25 @@
 , sqlalchemy
 , tenacity
 , typing-extensions
+, scikit-learn
 }:
 
 buildPythonPackage rec {
   pname = "apache-beam";
-  version = "2.37.0";
-  disabled = pythonAtLeast "3.10";
+  version = "2.40.0";
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "beam";
     rev = "v${version}";
-    sha256 = "sha256-FmfTxRLqXUHhhAZIxCRx2+phX0bmU5rIHaftBU4yBJY=";
+    sha256 = "sha256-0S7Dj6PMSbZkEAY6ZLUpKVfe/tFxsq60TTAFj0Qhtv0=";
   };
 
-  patches = [
-    # patch in the pyarrow.Table.to_batches(max_chunksize=...) argument fix
-    (fetchpatch {
-      url = "https://github.com/apache/beam/commit/2418a14ee99ff490d1c82944043f97f37ec97a85.patch";
-      sha256 = "sha256-G8ARBBf7nmF46P2ncnlteGFnPWq5iCqZDfuaosre9jY=";
-      stripLen = 2;
-    })
-  ];
-
   # See https://github.com/NixOS/nixpkgs/issues/156957.
   postPatch = ''
     substituteInPlace setup.py \
       --replace "dill>=0.3.1.1,<0.3.2" "dill" \
-      --replace "httplib2>=0.8,<0.20.0" "httplib2" \
-      --replace "pyarrow>=0.15.1,<7.0.0" "pyarrow"
+      --replace "pyarrow>=0.15.1,<8.0.0" "pyarrow"
   '';
 
   sourceRoot = "source/sdks/python";
@@ -115,6 +104,7 @@ buildPythonPackage rec {
     pytestCheckHook
     pyyaml
     requests-mock
+    scikit-learn
     sqlalchemy
     tenacity
   ];
@@ -150,6 +140,21 @@ buildPythonPackage rec {
     # different runners - I don't expect them to help debugging these
     # when running via our (= custom from their PoV) testing infra.
     "test_with_main_session"
+    # AssertionErrors
+    "test_unified_repr"
+    "testDictComprehension"
+    "testDictComprehensionSimple"
+    "testGenerator"
+    "testGeneratorComprehension"
+    "testListComprehension"
+    "testNoneReturn"
+    "testSet"
+    "testTupleListComprehension"
+    "test_newtype"
+    "test_pardo_type_inference"
+    "test_get_output_batch_type"
+    "test_pformat_namedtuple_with_unnamed_fields"
+    "test_row_coder_fail_early_bad_schema"
   ];
 
   meta = with lib; {
-- 
cgit 1.4.1