From e9c55912021adffb70185df5911540fdd47c7322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 12 Jun 2021 19:08:21 +0200 Subject: [PATCH] pythonPackages: move all throws to python-aliases.nix --- pkgs/top-level/python-aliases.nix | 15 ++++++++++++++- pkgs/top-level/python-packages.nix | 25 ------------------------- 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 566176eb48c3..4a19d69d5628 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -33,10 +33,23 @@ in ### Deprecated aliases - for backward compatibility mapAliases ({ - smart_open = smart-open; # added 2021-03-14 + blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 + bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 + detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 + faulthandler = throw "faulthandler is built into ${python.executable}"; + gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 + glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 google_api_python_client = google-api-python-client; # added 2021-03-19 googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 HAP-python = hap-python; # added 2021-06-01 MechanicalSoup = mechanicalsoup; # added 2021-06-01 + pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 + pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 + pytest-pep8 = pytestpep8; # added 2021-01-04 + pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 + qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 setuptools_scm = setuptools-scm; # added 2021-06-03 + smart_open = smart-open; # added 2021-03-14 + smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 + topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c0c04d2a9728..1f353b5cc2df 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1097,8 +1097,6 @@ in { blockdiag = callPackage ../development/python-modules/blockdiag { }; - blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 - block-io = callPackage ../development/python-modules/block-io { }; blspy = callPackage ../development/python-modules/blspy { }; @@ -1180,8 +1178,6 @@ in { btrfs = callPackage ../development/python-modules/btrfs { }; - bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 - bugsnag = callPackage ../development/python-modules/bugsnag { }; bugwarrior = callPackage ../development/python-modules/bugwarrior { }; @@ -1849,8 +1845,6 @@ in { desktop-notifier = callPackage ../development/python-modules/desktop-notifier { }; - detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 - devolo-home-control-api = callPackage ../development/python-modules/devolo-home-control-api { }; devpi-common = callPackage ../development/python-modules/devpi-common { }; @@ -2400,8 +2394,6 @@ in { fasttext = callPackage ../development/python-modules/fasttext { }; - faulthandler = throw "faulthandler is built into ${python.executable}"; - favicon = callPackage ../development/python-modules/favicon { }; fb-re2 = callPackage ../development/python-modules/fb-re2 { }; @@ -2797,8 +2789,6 @@ in { git-annex-adapter = callPackage ../development/python-modules/git-annex-adapter { }; - gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 - gitdb = callPackage ../development/python-modules/gitdb { }; github3_py = callPackage ../development/python-modules/github3_py { }; @@ -2812,8 +2802,6 @@ in { git-sweep = callPackage ../development/python-modules/git-sweep { }; - glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 - glances-api = callPackage ../development/python-modules/glances-api { }; glasgow = callPackage ../development/python-modules/glasgow { }; @@ -5918,8 +5906,6 @@ in { inherit (pkgs) libusb1; }; - pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 - pyliblo = callPackage ../development/python-modules/pyliblo { }; pylibmc = callPackage ../development/python-modules/pylibmc { }; @@ -6016,8 +6002,6 @@ in { pymsgbox = callPackage ../development/python-modules/pymsgbox { }; - pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 - pymsteams = callPackage ../development/python-modules/pymsteams { }; py-multiaddr = callPackage ../development/python-modules/py-multiaddr { }; @@ -6615,9 +6599,6 @@ in { pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; - pytest-pep8 = self.pytestpep8; # added 2021-01-04 - pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 - pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; pytest-pythonpath = callPackage ../development/python-modules/pytest-pythonpath { }; @@ -7104,8 +7085,6 @@ in { pyzufall = callPackage ../development/python-modules/pyzufall { }; - qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 - qcelemental = callPackage ../development/python-modules/qcelemental { }; qcengine = callPackage ../development/python-modules/qcengine { }; @@ -7819,8 +7798,6 @@ in { smhi-pkg = callPackage ../development/python-modules/smhi-pkg { }; - smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 - smmap = callPackage ../development/python-modules/smmap { }; smpplib = callPackage ../development/python-modules/smpplib { }; @@ -8440,8 +8417,6 @@ in { toposort = callPackage ../development/python-modules/toposort { }; - topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 - torchgpipe = callPackage ../development/python-modules/torchgpipe { }; torchvision = callPackage ../development/python-modules/torchvision { };