diff --git a/pkgs/development/python-modules/redbaron/default.nix b/pkgs/development/python-modules/redbaron/default.nix index bba07ec9995e..b3d2ce75643e 100644 --- a/pkgs/development/python-modules/redbaron/default.nix +++ b/pkgs/development/python-modules/redbaron/default.nix @@ -1,36 +1,61 @@ { lib, - fetchPypi, buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies baron, + + # tests pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "redbaron"; version = "0.9.2"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "0bqkq0wn20cc3qrcd1ifq74p4m570j345bkq4axl08kbr8whfba7"; + src = fetchFromGitHub { + owner = "PyCQA"; + repo = "redbaron"; + tag = finalAttrs.version; + hash = "sha256-Wgq7ltAsy4aPtfEiLp42p5pfcc/w9U0kFJTVNqy0iio="; }; - patches = [ ./fix-pygments-test.patch ]; + build-system = [ + setuptools + ]; - propagatedBuildInputs = [ baron ]; + dependencies = [ + baron + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; preCheck = '' - rm -rf tests/__pycache__ - rm tests/test_bounding_box.py - ''; # error about fixtures + cd tests + ''; - nativeCheckInputs = [ pytestCheckHook ]; + disabledTestPaths = [ + "test_bounding_box.py" + ]; + + disabledTests = [ + # AssertionError: assert '0 ----------...39m\x1b[39m\n' == '0 ----------...5m]\x1b[39m\n' + "test_highlight" + ]; meta = { - homepage = "https://github.com/PyCQA/redbaron"; description = "Abstraction on top of baron, a FST for python to make writing refactoring code a realistic task"; + homepage = "https://redbaron.readthedocs.io/en/latest"; + downloadPage = "https://github.com/PyCQA/redbaron"; + changelog = "https://github.com/PyCQA/redbaron/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ marius851000 ]; }; -} +}) diff --git a/pkgs/development/python-modules/redbaron/fix-pygments-test.patch b/pkgs/development/python-modules/redbaron/fix-pygments-test.patch deleted file mode 100644 index 82f12f80d139..000000000000 --- a/pkgs/development/python-modules/redbaron/fix-pygments-test.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/tests/test_no_pygments.py b/tests/test_no_pygments.py -index 1064653c23..f536bcca4b 100644 ---- a/tests/test_no_pygments.py -+++ b/tests/test_no_pygments.py -@@ -55,15 +55,15 @@ - out = captured.out - assert out == """\ - 0 ----------------------------------------------------- --\x1b[38;5;148mAssignmentNode\x1b[39m\x1b[38;5;197m(\x1b[39m\x1b[38;5;197m)\x1b[39m --\x1b[38;5;15m \x1b[39m\x1b[38;5;242m# identifiers: assign, assignment, assignment_, assignmentnode\x1b[39m --\x1b[38;5;15m \x1b[39m\x1b[38;5;15moperator\x1b[39m\x1b[38;5;197m=\x1b[39m\x1b[38;5;186m''\x1b[39m --\x1b[38;5;15m \x1b[39m\x1b[38;5;15mtarget\x1b[39m\x1b[38;5;15m \x1b[39m\x1b[38;5;197m->\x1b[39m --\x1b[38;5;15m \x1b[39m\x1b[38;5;148mNameNode\x1b[39m\x1b[38;5;197m(\x1b[39m\x1b[38;5;197m)\x1b[39m --\x1b[38;5;15m \x1b[39m\x1b[38;5;242m# identifiers: name, name_, namenode\x1b[39m --\x1b[38;5;15m \x1b[39m\x1b[38;5;15mvalue\x1b[39m\x1b[38;5;197m=\x1b[39m\x1b[38;5;186m'a'\x1b[39m --\x1b[38;5;15m \x1b[39m\x1b[38;5;15mannotation\x1b[39m\x1b[38;5;15m \x1b[39m\x1b[38;5;197m->\x1b[39m -+\x1b[38;5;148mAssignmentNode\x1b[39m\x1b[38;5;204m(\x1b[39m\x1b[38;5;204m)\x1b[39m -+\x1b[38;5;15m \x1b[39m\x1b[38;5;245m# identifiers: assign, assignment, assignment_, assignmentnode\x1b[39m -+\x1b[38;5;15m \x1b[39m\x1b[38;5;15moperator\x1b[39m\x1b[38;5;204m=\x1b[39m\x1b[38;5;186m''\x1b[39m -+\x1b[38;5;15m \x1b[39m\x1b[38;5;15mtarget\x1b[39m\x1b[38;5;15m \x1b[39m\x1b[38;5;204m->\x1b[39m -+\x1b[38;5;15m \x1b[39m\x1b[38;5;148mNameNode\x1b[39m\x1b[38;5;204m(\x1b[39m\x1b[38;5;204m)\x1b[39m -+\x1b[38;5;15m \x1b[39m\x1b[38;5;245m# identifiers: name, name_, namenode\x1b[39m -+\x1b[38;5;15m \x1b[39m\x1b[38;5;15mvalue\x1b[39m\x1b[38;5;204m=\x1b[39m\x1b[38;5;186m'a'\x1b[39m -+\x1b[38;5;15m \x1b[39m\x1b[38;5;15mannotation\x1b[39m\x1b[38;5;15m \x1b[39m\x1b[38;5;204m->\x1b[39m - \x1b[38;5;15m \x1b[39m\x1b[38;5;186mNone\x1b[39m --\x1b[38;5;15m \x1b[39m\x1b[38;5;15mvalue\x1b[39m\x1b[38;5;15m \x1b[39m\x1b[38;5;197m->\x1b[39m --\x1b[38;5;15m \x1b[39m\x1b[38;5;15m[\x1b[39m\x1b[38;5;15m]\x1b[39m -+\x1b[38;5;15m \x1b[39m\x1b[38;5;15mvalue\x1b[39m\x1b[38;5;15m \x1b[39m\x1b[38;5;204m->\x1b[39m -+\x1b[38;5;15m \x1b[39m\x1b[38;5;15m\x1b[38;5;15m[\x1b[39m\x1b[39m\x1b[38;5;15m\x1b[38;5;15m]\x1b[39m\x1b[39m - """