diff --git a/pkgs/development/python-modules/awkward0/default.nix b/pkgs/development/python-modules/awkward0/default.nix deleted file mode 100644 index ce9f1eabc77a..000000000000 --- a/pkgs/development/python-modules/awkward0/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, numpy -, pytest-runner -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "awkward0"; - version = "0.15.5"; - - src = fetchFromGitHub { - owner = "scikit-hep"; - repo = "awkward-0.x"; - rev = version; - sha256 = "039pxzgll2yz8xpr6bw788ymvgvqgna5kgl9m6d9mzi4yhbjsjpx"; - }; - - nativeBuildInputs = [ pytest-runner ]; - - propagatedBuildInputs = [ numpy ]; - - checkInputs = [ pytestCheckHook ]; - - # Can't find a fixture - disabledTests = [ "test_import_pandas" ]; - - pythonImportsCheck = [ "awkward0" ]; - - 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/development/python-modules/uproot3-methods/default.nix b/pkgs/development/python-modules/uproot3-methods/default.nix deleted file mode 100644 index f5760b974ffd..000000000000 --- a/pkgs/development/python-modules/uproot3-methods/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, numpy -, awkward0 -}: - -buildPythonPackage rec { - version = "0.10.1"; - pname = "uproot3-methods"; - - src = fetchPypi { - inherit pname version; - sha256 = "dd68f90be1ea276360b96369836849df29045f7fe4e534f9ac21ea00798ee358"; - }; - - nativeBuildInputs = [ awkward0 ]; - - propagatedBuildInputs = [ numpy awkward0 ]; - - # No tests on PyPi - doCheck = false; - pythonImportsCheck = [ "uproot3_methods" ]; - - meta = with 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/development/python-modules/uproot3/default.nix b/pkgs/development/python-modules/uproot3/default.nix deleted file mode 100644 index e5b3903eefa7..000000000000 --- a/pkgs/development/python-modules/uproot3/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, fetchFromGitHub, buildPythonPackage, isPy27 -, awkward0, backports_lzma ? null, cachetools, lz4, pandas -, pytestCheckHook, pkgconfig, mock -, numpy, requests, uproot3-methods, xxhash, zstandard -}: - -buildPythonPackage rec { - pname = "uproot3"; - version = "3.14.4"; - - src = fetchFromGitHub { - owner = "scikit-hep"; - repo = "uproot3"; - rev = version; - sha256 = "sha256-hVJpKdYvyoCPyqgZzKYp30SvkYm+HWSNBdd9bYCYACE="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace '"pytest-runner"' "" - ''; - - 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-aliases.nix b/pkgs/top-level/python-aliases.nix index 460b90b2b0b8..5db18622e775 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -38,6 +38,7 @@ mapAliases ({ anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 argon2_cffi = argon2-cffi; # added 2022-05-09 asyncio-nats-client = nats-py; # added 2022-02-08 + awkward0 = throw "awkward0 has been removed, use awkward instead"; # added 2022-12-13 Babel = babel; # added 2022-05-06 bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 @@ -217,6 +218,8 @@ mapAliases ({ tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 + uproot3 = throw "uproot3 has been removed, use uproot instead"; # added 2022-12-13 + uproot3-methods = throw "uproot3-methods has been removed"; # added 2022-12-13 Wand = wand; # added 2022-11-13 WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29 weakrefmethod = throw "weakrefmethod was removed since it's not needed in Python >= 3.4"; # added 2022-12-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 11674b16d09a..d7d43850dfb8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -815,7 +815,6 @@ self: super: with self; { awesomeversion = callPackage ../development/python-modules/awesomeversion { }; - awkward0 = callPackage ../development/python-modules/awkward0 { }; awkward = callPackage ../development/python-modules/awkward { }; awkward-cpp = callPackage ../development/python-modules/awkward-cpp { }; @@ -11675,10 +11674,6 @@ self: super: with self; { uproot = callPackage ../development/python-modules/uproot { }; - uproot3 = callPackage ../development/python-modules/uproot3 { }; - - uproot3-methods = callPackage ../development/python-modules/uproot3-methods { }; - uptime = callPackage ../development/python-modules/uptime { }; uptime-kuma-monitor = callPackage ../development/python-modules/uptime-kuma-monitor { };