From f9b7e743fe715262064ac9e838891d6ee9ef32c2 Mon Sep 17 00:00:00 2001
From: Samuel Ainsworth <skainsworth@gmail.com>
Date: Wed, 8 Feb 2023 13:51:08 -0800
Subject: python3Packages.apache-beam: 2.43.0 -> 2.44.0

---
 .../python-modules/apache-beam/default.nix         | 37 ++++++++++++----------
 1 file changed, 21 insertions(+), 16 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 08d69424e579f..3333948e7cc1c 100644
--- a/pkgs/development/python-modules/apache-beam/default.nix
+++ b/pkgs/development/python-modules/apache-beam/default.nix
@@ -4,6 +4,7 @@
 , cython
 , dill
 , fastavro
+, fasteners
 , fetchFromGitHub
 , fetchpatch
 , freezegun
@@ -11,11 +12,12 @@
 , grpcio-tools
 , hdfs
 , httplib2
+, hypothesis
 , lib
 , mock
 , mypy-protobuf
 , numpy
-, oauth2client
+, objsize
 , orjson
 , pandas
 , parameterized
@@ -26,32 +28,33 @@
 , pydot
 , pyhamcrest
 , pymongo
+, pytest-xdist
 , pytestCheckHook
 , python
 , python-dateutil
-, pythonAtLeast
 , pythonRelaxDepsHook
 , pytz
 , pyyaml
+, regex
 , requests
 , requests-mock
 , scikit-learn
-, setuptools
 , sqlalchemy
 , tenacity
 , testcontainers
 , typing-extensions
+, zstandard
 }:
 
 buildPythonPackage rec {
   pname = "apache-beam";
-  version = "2.43.0";
+  version = "2.44.0";
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "beam";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-lqGXCC66eyBnHcK06k9knggX5C+2d0m6xBAI5sh0RHo=";
+    hash = "sha256-5fnZxv2ZkFlv8vGDIt/6EL41v9P1iKa1tEd1nezq+PU=";
   };
 
   patches = [
@@ -62,13 +65,6 @@ buildPythonPackage rec {
       hash = "sha256-iUmnzrItTFM98w3mpadzrmtI3t0fucpSujAg/6qxCGk=";
       stripLen = 2;
     })
-    (fetchpatch {
-      # https://github.com/apache/beam/pull/24573
-      name = "relax-httplib2-version.patch";
-      url = "https://github.com/apache/beam/commit/4045503575ae5ccef3de8d7b868c54e37fef658b.patch";
-      hash = "sha256-YqT+sHaa1R9vLQnEQN2K0lYoCdnGoPY9qduGBpXPaek=";
-      stripLen = 2;
-    })
   ];
 
   pythonRelaxDeps = [
@@ -80,6 +76,12 @@ buildPythonPackage rec {
 
     # See https://github.com/NixOS/nixpkgs/issues/193613
     "protobuf"
+
+    # As of apache-beam v2.44.0, the requirement is httplib2>=0.8,<0.21.0, but
+    # the current (2023-02-08) nixpkgs's httplib2 version is 0.21.0. This can be
+    # removed once beam is upgraded since the current requirement on master is
+    # for httplib2>=0.8,<0.22.0.
+    "httplib2"
   ];
 
   sourceRoot = "source/sdks/python";
@@ -94,14 +96,14 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     cloudpickle
     crcmod
-    cython
     dill
     fastavro
+    fasteners
     grpcio
     hdfs
     httplib2
     numpy
-    oauth2client
+    objsize
     orjson
     proto-plus
     protobuf
@@ -110,9 +112,10 @@ buildPythonPackage rec {
     pymongo
     python-dateutil
     pytz
+    regex
     requests
-    setuptools
     typing-extensions
+    zstandard
   ];
 
   enableParallelBuilding = true;
@@ -121,14 +124,16 @@ buildPythonPackage rec {
     "apache_beam"
   ];
 
-  nativeCheckInputs = [
+  checkInputs = [
     freezegun
+    hypothesis
     mock
     pandas
     parameterized
     psycopg2
     pyhamcrest
     pytestCheckHook
+    pytest-xdist
     pyyaml
     requests-mock
     scikit-learn
-- 
cgit 1.4.1