Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

python312Packages.blessings: drop #336152

Merged
merged 10 commits into from
Sep 22, 2024
44 changes: 44 additions & 0 deletions pkgs/by-name/cb/cbeams/package.nix
Original file line number Diff line number Diff line change
@@ -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
];
};
}
35 changes: 0 additions & 35 deletions pkgs/development/python-modules/blessings/default.nix

This file was deleted.

31 changes: 27 additions & 4 deletions pkgs/development/python-modules/invocations/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
lib,
buildPythonPackage,
blessings,
blessed,
fetchFromGitHub,
invoke,
pythonOlder,
Expand All @@ -10,6 +10,11 @@
tabulate,
tqdm,
twine,
pytestCheckHook,
pytest-relaxed,
pytest-mock,
icecream,
pip,
}:

buildPythonPackage rec {
Expand All @@ -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
Expand All @@ -41,11 +48,27 @@ buildPythonPackage rec {
twine
];

# There's an error loading the test suite. See https://github.com/pyinvoke/invocations/issues/29.
doCheck = false;
nativeCheckInputs = [
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/";
Expand Down
Original file line number Diff line number Diff line change
@@ -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",
51 changes: 0 additions & 51 deletions pkgs/development/python-modules/n3fit/default.nix

This file was deleted.

2 changes: 0 additions & 2 deletions pkgs/development/python-modules/pytest-relaxed/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
buildPythonPackage,
decorator,
fetchPypi,
invocations,
invoke,
pytest,
pytestCheckHook,
Expand All @@ -27,7 +26,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [ decorator ];

nativeCheckInputs = [
invocations
invoke
pytestCheckHook
];
Expand Down
57 changes: 0 additions & 57 deletions pkgs/development/python-modules/reportengine/default.nix

This file was deleted.

34 changes: 0 additions & 34 deletions pkgs/development/python-modules/ronin/default.nix

This file was deleted.

48 changes: 0 additions & 48 deletions pkgs/development/python-modules/validphys2/default.nix

This file was deleted.

Loading