From f8f0db26fc897ca06bb9d13dead476983e50a6f9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Dec 2020 09:04:55 +0000 Subject: [PATCH 1/4] python37Packages.uproot{,3}-methods: 0.9.1 -> 0.10.0 --- .../python-modules/uproot-methods/default.nix | 28 ----------------- .../uproot3-methods/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 31 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/python-modules/uproot-methods/default.nix create mode 100644 pkgs/development/python-modules/uproot3-methods/default.nix diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix deleted file mode 100644 index 3c268ed7ed4..00000000000 --- a/pkgs/development/python-modules/uproot-methods/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, numpy -, awkward -}: - -buildPythonPackage rec { - version = "0.9.1"; - pname = "uproot-methods"; - - src = fetchPypi { - inherit pname version; - sha256 = "accb4392c59a1485ce3ee6d78a6fd163731ade8b9b5208e7bde8fa1767aef097"; - }; - - propagatedBuildInputs = [ numpy awkward ]; - - # No tests on PyPi - doCheck = false; - - meta = with stdenv.lib; { - homepage = "https://github.com/scikit-hep/uproot-methods"; - description = "Pythonic mix-ins for ROOT classes"; - license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/uproot3-methods/default.nix b/pkgs/development/python-modules/uproot3-methods/default.nix new file mode 100644 index 00000000000..3a9457a574b --- /dev/null +++ b/pkgs/development/python-modules/uproot3-methods/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +, awkward0 +}: + +buildPythonPackage rec { + version = "0.10.0"; + pname = "uproot3-methods"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rk9i1ra3panli96ghz80ddpqk77xb1kpxs3wf8rw0jy5d88pc26"; + }; + + nativeBuildInputs = [ awkward0 ]; + + propagatedBuildInputs = [ numpy awkward0 ]; + + # No tests on PyPi + doCheck = false; + + meta = with stdenv.lib; { + homepage = "https://github.com/scikit-hep/uproot3-methods"; + description = "Pythonic mix-ins for ROOT classes"; + license = licenses.bsd3; + maintainers = with maintainers; [ costrouc SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 93f09234a45..61b12ebb426 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7580,7 +7580,7 @@ in { uproot = callPackage ../development/python-modules/uproot { }; - uproot-methods = callPackage ../development/python-modules/uproot-methods { }; + uproot3-methods = callPackage ../development/python-modules/uproot3-methods { }; uptime = callPackage ../development/python-modules/uptime { }; From 7e9c3ff8bae88eb1e3ce3d6989a9c443bf969088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 7 Dec 2020 14:03:15 +0100 Subject: [PATCH 2/4] pythonPackages.awkward{,0}: 0.14.0 -> 0.15.1 --- .../python-modules/awkward/default.nix | 34 ---------------- .../python-modules/awkward0/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 40 insertions(+), 35 deletions(-) delete mode 100644 pkgs/development/python-modules/awkward/default.nix create mode 100644 pkgs/development/python-modules/awkward0/default.nix diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix deleted file mode 100644 index 6a919c768c7..00000000000 --- a/pkgs/development/python-modules/awkward/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, numpy -, pandas -, pytestrunner -, pytest -, h5py -}: - -buildPythonPackage rec { - pname = "awkward"; - version = "0.14.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "6a3878f46e8bc2acf28a0b9feb69d354ad2fee2a2a0f65c48c115aa74f245204"; - }; - - nativeBuildInputs = [ pytestrunner ]; - checkInputs = [ pandas pytest h5py ]; - propagatedBuildInputs = [ numpy ]; - - checkPhase = '' - py.test - ''; - - meta = with lib; { - description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy"; - homepage = "https://github.com/scikit-hep/awkward-array"; - license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/awkward0/default.nix b/pkgs/development/python-modules/awkward0/default.nix new file mode 100644 index 00000000000..4441d131e63 --- /dev/null +++ b/pkgs/development/python-modules/awkward0/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, pandas +, pytestrunner +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "awkward0"; + version = "0.15.1"; + + src = fetchFromGitHub { + owner = "scikit-hep"; + repo = "awkward-0.x"; + rev = version; + sha256 = "17zrw25h6g5m4ik1c5piqb7q2bxrshfm4hm3lzfz4s8gi0xjm5gz"; + }; + + nativeBuildInputs = [ pytestrunner ]; + + propagatedBuildInputs = [ numpy ]; + + checkInputs = [ pandas pytestCheckHook ]; + + checkPhase = '' + # Almost all tests in this file fail + rm tests/test_persist.py + py.test + ''; + + meta = with lib; { + description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy"; + homepage = "https://github.com/scikit-hep/awkward-array"; + license = licenses.bsd3; + maintainers = with maintainers; [ costrouc SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 61b12ebb426..d965529fa71 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -504,7 +504,7 @@ in { awesome-slugify = callPackage ../development/python-modules/awesome-slugify { }; - awkward = callPackage ../development/python-modules/awkward { }; + awkward0 = callPackage ../development/python-modules/awkward0 { }; awkward1 = callPackage ../development/python-modules/awkward1 { }; aws-adfs = callPackage ../development/python-modules/aws-adfs { }; From 9bd0caf66b9e807bd82836a56e89a45ba101ba67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 7 Dec 2020 14:04:28 +0100 Subject: [PATCH 3/4] 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 { }; From 2722142fbe1e82e8c91ab94b54877b09472a5326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 7 Dec 2020 14:16:35 +0100 Subject: [PATCH 4/4] pythonPackages.pyrsistent: Disable on Python 2 --- pkgs/development/python-modules/pyrsistent/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index a343db4f554..7da3239f3e7 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , six , pytest_4 , hypothesis_4 @@ -11,6 +12,8 @@ buildPythonPackage rec { pname = "pyrsistent"; version = "0.17.3"; + disabled = isPy27; + src = fetchPypi { inherit pname version; sha256 = "2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e";