python312Packages.blessings: drop (#336152)

pkgs/by-name/cb/cbeams/package.nix

@@ -0,0 +1,44 @@
+{
+  lib,
+  python3Packages,
+  fetchPypi,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "cbeams";
+  version = "1.0.3";
+  pyproject = true;
+
+  disabled = !python3Packages.isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-8Q2sWsAc39Mu34K1wWOKOJERKzBStE4GmtuzOs2T7Kk=";
+  };
+
+  build-system = [ python3Packages.setuptools ];
+
+  postPatch = ''
+    substituteInPlace cbeams/terminal.py \
+      --replace-fail "blessings" "blessed"
+  '';
+
+  pythonRemoveDeps = [ "blessings" ];
+
+  dependencies = with python3Packages; [
+    blessed
+    docopt
+  ];
+
+  doCheck = false; # no tests
+
+  meta = {
+    homepage = "https://github.com/tartley/cbeams";
+    description = "Command-line program to draw animated colored circles in the terminal";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
+      oxzi
+      sigmanificient
+    ];
+  };
+}

pkgs/development/python-modules/blessings/default.nix

@@ -1,35 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  six,
-  nose,
-}:
-
-buildPythonPackage rec {
-  pname = "blessings";
-  version = "1.7";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "98e5854d805f50a5b58ac2333411b0482516a8210f23f43308baeb58d77c157d";
-  };
-
-  # 4 failing tests, 2to3
-  doCheck = false;
-
-  propagatedBuildInputs = [ six ];
-  nativeCheckInputs = [ nose ];
-
-  checkPhase = ''
-    nosetests
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/erikrose/blessings";
-    description = "Thin, practical wrapper around terminal coloring, styling, and positioning";
-    license = licenses.mit;
-    maintainers = with maintainers; [ domenkozar ];
-  };
-}

pkgs/development/python-modules/invocations/default.nix

@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  blessings,
+  blessed,
   fetchFromGitHub,
   invoke,
   pythonOlder,
@@ -10,6 +10,11 @@
   tabulate,
   tqdm,
   twine,
+  pytestCheckHook,
+  pytest-relaxed,
+  pytest-mock,
+  icecream,
+  pip,
 }:
 
 buildPythonPackage rec {
@@ -26,13 +31,15 @@ buildPythonPackage rec {
     hash = "sha256-JnhdcxhBNsYgDMcljtGKjOT1agujlao/66QifGuh6I0=";
   };
 
+  patches = [ ./replace-blessings-with-blessed.patch ];
+
   postPatch = ''
     substituteInPlace setup.py \
       --replace "semantic_version>=2.4,<2.7" "semantic_version"
   '';
 
   propagatedBuildInputs = [
-    blessings
+    blessed
     invoke
     releases
     semantic-version
@@ -41,11 +48,27 @@ buildPythonPackage rec {
     twine
   ];
 
-  # There's an error loading the test suite. See https://github.com/pyinvoke/invocations/issues/29.
+  nativeCheckInputs = [
-  doCheck = false;
+    pytestCheckHook
+    pytest-relaxed
+    pytest-mock
+    icecream
+    pip
+  ];
 
   pythonImportsCheck = [ "invocations" ];
 
+  disabledTests = [
+    # invoke.exceptions.UnexpectedExit
+    "autodoc_"
+
+    # ValueError: Call either Version('1.2.3') or Version(major=1, ...)
+    "component_state_enums_contain_human_readable_values"
+    "load_version_"
+    "prepare_"
+    "status_"
+  ];
+
   meta = with lib; {
     description = "Common/best-practice Invoke tasks and collections";
     homepage = "https://invocations.readthedocs.io/";

pkgs/development/python-modules/invocations/replace-blessings-with-blessed.patch

@@ -0,0 +1,26 @@
+diff --git a/invocations/packaging/release.py b/invocations/packaging/release.py
+index 54322c3..81ac173 100644
+--- a/invocations/packaging/release.py
++++ b/invocations/packaging/release.py
+@@ -23,7 +23,7 @@ from shutil import rmtree
+ 
+ from invoke.vendor.lexicon import Lexicon
+ 
+-from blessings import Terminal
++from blessed import Terminal
+ from docutils.utils import Reporter
+ from enum import Enum
+ from invoke import Collection, task, Exit
+diff --git a/setup.py b/setup.py
+index 78ae28b..c78a74c 100644
+--- a/setup.py
++++ b/setup.py
+@@ -16,7 +16,7 @@ requirements = [
+     # time if missing), but that got hairy fast, and these are all
+     # pure-Python packages, so it shouldn't be a huge burden for users to
+     # obtain them.
+-    "blessings>=1.6",
++    "blessed",
+     "releases>=1.6",
+     "semantic_version>=2.4,<2.7",
+     "tabulate>=0.7.5",

pkgs/development/python-modules/n3fit/default.nix

@@ -1,51 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  hyperopt,
-  keras,
-  nnpdf,
-  psutil,
-  tensorflow,
-  validphys2,
-}:
-
-buildPythonPackage rec {
-  pname = "n3fit";
-  version = "4.0";
-  format = "setuptools";
-
-  inherit (nnpdf) src;
-
-  prePatch = ''
-    cd n3fit
-  '';
-
-  postPatch = ''
-    substituteInPlace src/n3fit/version.py \
-      --replace '= __give_git()' '= "'$version'"'
-  '';
-
-  propagatedBuildInputs = [
-    hyperopt
-    keras
-    psutil
-    tensorflow
-    validphys2
-  ];
-
-  postInstall = ''
-    for prog in "$out"/bin/*; do
-      wrapProgram "$prog" --set PYTHONPATH "$PYTHONPATH:$(toPythonPath "$out")"
-    done
-  '';
-
-  doCheck = false; # no tests
-  pythonImportsCheck = [ "n3fit" ];
-
-  meta = with lib; {
-    description = "NNPDF fitting framework";
-    homepage = "https://docs.nnpdf.science";
-    inherit (nnpdf.meta) license;
-    maintainers = with maintainers; [ veprbl ];
-  };
-}

pkgs/development/python-modules/pytest-relaxed/default.nix

@@ -3,7 +3,6 @@
   buildPythonPackage,
   decorator,
   fetchPypi,
-  invocations,
   invoke,
   pytest,
   pytestCheckHook,
@@ -27,7 +26,6 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ decorator ];
 
   nativeCheckInputs = [
-    invocations
     invoke
     pytestCheckHook
   ];

pkgs/development/python-modules/reportengine/default.nix

@@ -1,57 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  flit,
-  jinja2,
-  ruamel-yaml,
-  matplotlib,
-  pandas,
-  pandoc,
-  pygments,
-  blessings,
-  curio,
-  hypothesis,
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "reportengine";
-  version = "0.31";
-  format = "pyproject";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-jrt+ml8o1PUidV1bY0hCyNgcPaVTBloW574/i5Pl7iE=";
-  };
-
-  nativeBuildInputs = [ flit ];
-
-  propagatedBuildInputs = [
-    jinja2
-    ruamel-yaml
-    matplotlib
-    pandas
-    pygments
-    blessings
-    curio
-  ];
-
-  nativeCheckInputs = [
-    hypothesis
-    pandoc
-    pytestCheckHook
-  ];
-
-  pythonImportsCheck = [ "reportengine" ];
-
-  meta = with lib; {
-    description = "Framework for declarative data analysis";
-    homepage = "https://github.com/NNPDF/reportengine/";
-    license = with licenses; [ gpl2Only ];
-    maintainers = with maintainers; [ veprbl ];
-    # Incompatibility with ruamel >= 0.18
-    # https://github.com/NNPDF/reportengine/issues/60
-    broken = versionAtLeast ruamel-yaml.version "0.18";
-  };
-}

pkgs/development/python-modules/ronin/default.nix

@@ -1,34 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  blessings,
-  colorama,
-  glob2,
-}:
-
-buildPythonPackage rec {
-  pname = "ronin";
-  version = "1.1.1";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit version pname;
-    hash = "sha256-5gZ8S0NR4JzKBIdi/xYtVmFg9ObbCSkT7sz+OKWnK/U=";
-  };
-
-  propagatedBuildInputs = [
-    blessings
-    colorama
-    glob2
-  ];
-
-  pythonImportsCheck = [ "ronin" ];
-
-  meta = with lib; {
-    homepage = "https://github.com/tliron/ronin/";
-    description = "Straightforward but powerful build system based on Ninja and Python";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ AndersonTorres ];
-  };
-}

pkgs/development/python-modules/validphys2/default.nix

@@ -1,48 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  lhapdf,
-  nnpdf,
-  prompt-toolkit,
-  reportengine,
-  requests,
-  seaborn,
-  validobj,
-}:
-
-buildPythonPackage rec {
-  pname = "validphys2";
-  version = "4.0";
-  format = "setuptools";
-
-  inherit (nnpdf) src;
-
-  prePatch = ''
-    cd validphys2
-  '';
-
-  postPatch = ''
-    substituteInPlace src/validphys/version.py \
-      --replace '= __give_git()' '= "'$version'"'
-  '';
-
-  propagatedBuildInputs = [
-    lhapdf
-    nnpdf
-    prompt-toolkit
-    reportengine
-    requests
-    seaborn
-    validobj
-  ];
-
-  doCheck = false; # no tests
-  pythonImportsCheck = [ "validphys" ];
-
-  meta = with lib; {
-    description = "NNPDF analysis framework";
-    homepage = "https://data.nnpdf.science/validphys-docs/guide.html";
-    inherit (nnpdf.meta) license;
-    maintainers = with maintainers; [ veprbl ];
-  };
-}

pkgs/misc/cbeams/default.nix

@@ -1,21 +0,0 @@
-{ lib, buildPythonApplication, fetchPypi, isPy3k, blessings, docopt }:
-
-buildPythonApplication rec {
-  pname = "cbeams";
-  version = "1.0.3";
-  disabled = !isPy3k;
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1agcjg6kmcyvk834xd2j60mi349qi9iw3dc2vwpd7pqwq1daq3gi";
-  };
-
-  propagatedBuildInputs = [ blessings docopt ];
-
-  meta = with lib; {
-    homepage = "https://github.com/tartley/cbeams";
-    description = "Command-line program to draw animated colored circles in the terminal";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ oxzi ];
-  };
-}

pkgs/top-level/aliases.nix

@@ -1620,6 +1620,7 @@ mapAliases {
   ### V ###
 
   v4l_utils = throw "'v4l_utils' has been renamed to/replaced by 'v4l-utils'"; # Converted to throw 2023-09-10
+  validphys2 = throw "validphys2 has been removed, since it has a broken dependency that was removed"; # Added 2024-08-21
   vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26
   vaapiIntel = intel-vaapi-driver; # Added 2023-05-31
   vaapiVdpau = libva-vdpau-driver; # Added 2024-06-05

pkgs/top-level/all-packages.nix

@@ -36704,8 +36704,6 @@ with pkgs;
 
   shtns = callPackage ../applications/science/physics/shtns { };
 
-  validphys2 = with python3Packages; toPythonApplication validphys2;
-
   xfitter = callPackage ../applications/science/physics/xfitter { };
 
   xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { };

pkgs/top-level/python-aliases.nix

@@ -73,6 +73,7 @@ mapAliases ({
   bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04
   bip_utils = bip-utils; # 2023-10-08
   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
+  blessings = throw "blessings has been removed in favor of blessed, as it was unmaintained"; # added 2024-08-20
   BlinkStick = blinkstick; # added 2023-02-19
   blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29
   bsblan = python-bsblan; # added 2022-11-04
@@ -332,6 +333,7 @@ mapAliases ({
   mrkd = throw "mrkd has been promoted to a top-level attribute name: `pkgs.mrkd`"; # added 2023-08-01
   multi_key_dict = multi-key-dict; # added 2023-11-05
   mutmut = throw "mutmut has been promoted to a top-level attribute name: `pkgs.mutmut`"; # added 2022-10-02
+  n3fit = throw "n3fit has been removed since it relies on a dependency that was removed"; # added 2024-08-24
   nbmerge = throw "nbmerge has moved to pkgs.nbmerge"; # added 2024-07-05
   mypy-boto3-alexaforbusiness = throw "mypy-boto3-alexaforbusiness was removed because it is unmaintained"; # added 2024-09-04
   mypy-boto3-backupstorage = throw "mypy-boto3-backupstorage was removed because it is unmaintained"; # added 2024-09-04
@@ -535,6 +537,7 @@ mapAliases ({
   recursivePthLoader = recursive-pth-loader; # added 2024-01-07
   rednose = throw "rednose is no longer maintained (since February 2018)"; # added 2023-08-06
   repeated_test = repeated-test; # added 2022-11-15
+  reportengine = throw "reportengine has been removed, since it is unmaintained and broken"; # added 2024-08-21
   repoze_lru = repoze-lru; # added 2023-11-11
   repoze_sphinx_autointerface = repoze-sphinx-autointerface; # added 2023-11-11
   repoze_who = repoze-who; # added 2023-11-11
@@ -548,6 +551,7 @@ mapAliases ({
   rig = throw "rig has been removed because it was pinned to python 2.7 and 3.5, failed to build and is otherwise unmaintained"; # added 2022-11-28
   rl-coach = "rl-coach was removed because the project is discontinued and was archived by upstream"; # added 2023-05-03
   roboschool = throw "roboschool is deprecated in favor of PyBullet and has been removed"; # added 2022-01-15
+  ronin = throw "ronin has been removed because it was unmaintained since 2018"; # added 2024-08-21
   ROPGadget = ropgadget; # added 2021-07-06
   rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01
   ruamel_base = ruamel-base; # added 2021-11-01
@@ -640,6 +644,7 @@ mapAliases ({
   urwid-mitmproxy-mitmproxy = throw "urwid-mitmproxy has been removed because mitmproxy no longer uses it"; # Added 2024-07-26
   uuid = throw "uuid is a Python standard module"; # added 2024-04-18
   validictory = throw "validictory has been removed, since it abandoned"; # added 2023-07-07
+  validphys2 = throw "validphys2 has been removed, since it had a broken dependency that was removed"; # added 2023-07-07
   vega_datasets = vega-datasets; # added 2023-11-04
   ViennaRNA = viennarna; # added 2023-08-23
   virtual-display = throw "virtual-display has been renamed to PyVirtualDisplay"; # added 2023-01-07

pkgs/top-level/python-packages.nix

@@ -1689,8 +1689,6 @@ self: super: with self; {
 
   blessed = callPackage ../development/python-modules/blessed { };
 
-  blessings = callPackage ../development/python-modules/blessings { };
-
   blinker = callPackage ../development/python-modules/blinker { };
 
   blinkpy = callPackage ../development/python-modules/blinkpy { };
@@ -2054,8 +2052,6 @@ self: super: with self; {
 
   cattrs = callPackage ../development/python-modules/cattrs { };
 
-  cbeams = callPackage ../misc/cbeams { };
-
   cbor2 = callPackage ../development/python-modules/cbor2 { };
 
   cbor = callPackage ../development/python-modules/cbor { };
@@ -8659,8 +8655,6 @@ self: super: with self; {
 
   myuplink = callPackage ../development/python-modules/myuplink { };
 
-  n3fit = callPackage ../development/python-modules/n3fit { };
-
   nad-receiver = callPackage ../development/python-modules/nad-receiver { };
 
   nagiosplugin = callPackage ../development/python-modules/nagiosplugin { };
@@ -13471,8 +13465,6 @@ self: super: with self; {
 
   repocheck = callPackage ../development/python-modules/repocheck { };
 
-  reportengine = callPackage ../development/python-modules/reportengine { };
-
   reportlab = callPackage ../development/python-modules/reportlab { };
 
   reportlab-qrcode = callPackage ../development/python-modules/reportlab-qrcode { };
@@ -13717,8 +13709,6 @@ self: super: with self; {
 
   roonapi = callPackage ../development/python-modules/roonapi { };
 
-  ronin = callPackage ../development/python-modules/ronin { };
-
   rope = callPackage ../development/python-modules/rope { };
 
   ropgadget = callPackage ../development/python-modules/ropgadget { };
@@ -17033,8 +17023,6 @@ self: super: with self; {
 
   validobj = callPackage ../development/python-modules/validobj { };
 
-  validphys2 = callPackage ../development/python-modules/validphys2 { };
-
   vallox-websocket-api = callPackage ../development/python-modules/vallox-websocket-api { };
 
   vapoursynth = callPackage ../development/python-modules/vapoursynth {