From 90c6f12f46168866cf7d9ee1a37dbace28a200b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Aug 2022 00:15:34 +0000
Subject: [PATCH 1/2] python310Packages.papermill: 2.3.4 -> 2.4.0

---
 pkgs/development/python-modules/papermill/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix
index c9ef2298559f..8e1ab4d4a12b 100644
--- a/pkgs/development/python-modules/papermill/default.nix
+++ b/pkgs/development/python-modules/papermill/default.nix
@@ -23,11 +23,11 @@
 
 buildPythonPackage rec {
   pname = "papermill";
-  version = "2.3.4";
+  version = "2.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "be12d2728989c0ae17b42fcb05b623500004e94b34f56bd153355ccebb84a59a";
+    sha256 = "sha256-b4+KmwazlnfyB8CRAMjThrz1kvDLvdqfD1DoFEVpdic=";
   };
 
   propagatedBuildInputs = [

From 1f6892c38ab5a5f08d224cc42cd667cbb921ca51 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 18 Aug 2022 10:05:05 +0200
Subject: [PATCH 2/2] python310Packages.papermill:  add pythonImportsCheck

- disable on older Python releases
- add extra requirements
---
 .../python-modules/papermill/default.nix      | 73 ++++++++++++-------
 1 file changed, 46 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix
index 8e1ab4d4a12b..d9de15ad76ee 100644
--- a/pkgs/development/python-modules/papermill/default.nix
+++ b/pkgs/development/python-modules/papermill/default.nix
@@ -1,54 +1,69 @@
 { lib
-, buildPythonPackage
-, fetchPypi
 , ansiwrap
+, azure-datalake-store
+, azure-storage-blob
+, boto3
+, buildPythonPackage
 , click
-, future
-, pyyaml
-, nbformat
-, nbconvert
-, nbclient
-, six
-, tqdm
-, jupyter-client
-, requests
 , entrypoints
-, tenacity
-, futures ? null
-, backports_tempfile
-, isPy27
-, pytestCheckHook
+, fetchPypi
+, gcsfs
+, nbclient
+, nbformat
+, pyarrow
+, PyGithub
 , pytest-mock
+, pytestCheckHook
+, pythonOlder
+, pyyaml
+, requests
+, tenacity
+, tqdm
 }:
 
 buildPythonPackage rec {
   pname = "papermill";
   version = "2.4.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-b4+KmwazlnfyB8CRAMjThrz1kvDLvdqfD1DoFEVpdic=";
+    hash = "sha256-b4+KmwazlnfyB8CRAMjThrz1kvDLvdqfD1DoFEVpdic=";
   };
 
   propagatedBuildInputs = [
     ansiwrap
     click
-    future
     pyyaml
     nbformat
-    nbconvert
     nbclient
-    six
     tqdm
-    jupyter-client
     requests
     entrypoints
     tenacity
-  ] ++ lib.optionals isPy27 [
-    futures
-    backports_tempfile
   ];
 
+  passthru.optional-dependencies = {
+    azure = [
+      azure-datalake-store
+      azure-storage-blob
+    ];
+    gcs = [
+      gcsfs
+    ];
+    github = [
+      PyGithub
+    ];
+    hdfs = [
+      pyarrow
+    ];
+    s3 = [
+      boto3
+    ];
+  };
+
   checkInputs = [
     pytestCheckHook
     pytest-mock
@@ -58,13 +73,17 @@ buildPythonPackage rec {
     export HOME=$(mktemp -d)
   '';
 
-  # the test suite depends on cloud resources azure/aws
+  # The test suite depends on cloud resources azure/aws
   doCheck = false;
 
+  pythonImportsCheck = [
+    "papermill"
+  ];
+
   meta = with lib; {
-    description = "Parametrize and run Jupyter and nteract Notebooks";
+    description = "Parametrize and run Jupyter and interact with notebooks";
     homepage = "https://github.com/nteract/papermill";
     license = licenses.bsd3;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ costrouc ];
   };
 }