From 9bd0caf66b9e807bd82836a56e89a45ba101ba67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 7 Dec 2020 14:04:28 +0100
Subject: [PATCH] pythonPackages.uproot{,3}: 3.13.1 -> 3.14.1

---
 .../python-modules/uproot/default.nix         | 59 -------------------
 .../python-modules/uproot3/default.nix        | 44 ++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +-
 3 files changed, 45 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/development/python-modules/uproot/default.nix
 create mode 100644 pkgs/development/python-modules/uproot3/default.nix

diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix
deleted file mode 100644
index eadd6c36de1..00000000000
--- a/pkgs/development/python-modules/uproot/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ lib, fetchPypi, buildPythonPackage, isPy27
-, awkward
-, backports_lzma
-, cachetools
-, lz4
-, pandas
-, pytestrunner
-, pytest
-, pkgconfig
-, mock
-, numpy
-, requests
-, uproot-methods
-, xxhash
-}:
-
-buildPythonPackage rec {
-  pname = "uproot";
-  version = "3.13.1";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "099b0b274dc000faf724df835579c76306e60200a5ba7b600a0c4b76dabbf344";
-  };
-
-  nativeBuildInputs = [ pytestrunner ];
-
-  checkInputs = [
-    lz4
-    mock
-    pandas
-    pkgconfig
-    pytest
-    requests
-    xxhash
-  ] ++ lib.optional isPy27 backports_lzma;
-
-  propagatedBuildInputs = [
-    numpy
-    cachetools
-    uproot-methods
-    awkward
-  ];
-
-  # skip tests which do network calls
-  # test_compression.py is missing zstandard package
-  checkPhase = ''
-    pytest tests -k 'not hist_in_tree \
-      and not branch_auto_interpretation' \
-      --ignore=tests/test_compression.py
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/scikit-hep/uproot";
-    description = "ROOT I/O in pure Python and Numpy";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ ktf ];
-  };
-}
diff --git a/pkgs/development/python-modules/uproot3/default.nix b/pkgs/development/python-modules/uproot3/default.nix
new file mode 100644
index 00000000000..0d0c2365b63
--- /dev/null
+++ b/pkgs/development/python-modules/uproot3/default.nix
@@ -0,0 +1,44 @@
+{ lib, fetchFromGitHub, buildPythonPackage, isPy27
+, awkward0, backports_lzma, cachetools, lz4, pandas
+, pytestCheckHook, pytestrunner, pkgconfig, mock
+, numpy, requests, uproot3-methods, xxhash, zstandard
+}:
+
+buildPythonPackage rec {
+  pname = "uproot3";
+  version = "3.14.1";
+
+  src = fetchFromGitHub {
+    owner = "scikit-hep";
+    repo = "uproot3";
+    rev = version;
+    sha256 = "1npwh4l96wg3m24jhfc8i84nfwfc18flrmymf80fx101wmpi2qz8";
+  };
+
+  nativeBuildInputs = [ pytestrunner ];
+
+  propagatedBuildInputs = [
+    awkward0
+    cachetools
+    lz4
+    numpy
+    uproot3-methods
+    xxhash
+    zstandard
+  ] ++ lib.optional isPy27 backports_lzma;
+
+  checkInputs = [
+    mock
+    pandas
+    pkgconfig
+    pytestCheckHook
+    requests
+  ] ++ lib.optional isPy27 backports_lzma;
+
+  meta = with lib; {
+    homepage = "https://github.com/scikit-hep/uproot3";
+    description = "ROOT I/O in pure Python and Numpy";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ktf SuperSandro2000 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d965529fa71..5ccf4eaadaa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7578,7 +7578,7 @@ in {
 
   update-dotdee = callPackage ../development/python-modules/update-dotdee { };
 
-  uproot = callPackage ../development/python-modules/uproot { };
+  uproot3 = callPackage ../development/python-modules/uproot3 { };
 
   uproot3-methods = callPackage ../development/python-modules/uproot3-methods { };