From a834a94ea79e7109051e100ec024286677fbad66 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 29 Apr 2025 09:41:42 +0200 Subject: [PATCH 1/4] python312Packages.test2ref: init at 0.8.2 --- .../python-modules/test2ref/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/test2ref/default.nix diff --git a/pkgs/development/python-modules/test2ref/default.nix b/pkgs/development/python-modules/test2ref/default.nix new file mode 100644 index 000000000000..4b85ef83314b --- /dev/null +++ b/pkgs/development/python-modules/test2ref/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pdm-backend, + binaryornot, + pytest-cov-stub, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "test2ref"; + version = "0.8.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nbiotcloud"; + repo = "test2ref"; + tag = "v${version}"; + hash = "sha256-Rgm7qZc1pFY/9gwzHjnI305Ch9enXzzWRsPZ7CQjzpQ="; + }; + + build-system = [ + pdm-backend + ]; + + dependencies = [ + binaryornot + ]; + + pythonImportsCheck = [ "test2ref" ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; + + meta = { + description = "Testing Against Learned Reference Data"; + homepage = "https://github.com/nbiotcloud/test2ref"; + changelog = "https://github.com/nbiotcloud/test2ref/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1f055b73bc97..cdff365e8b1f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17164,6 +17164,8 @@ self: super: with self; { test-tube = callPackage ../development/python-modules/test-tube { }; + test2ref = callPackage ../development/python-modules/test2ref { }; + testbook = callPackage ../development/python-modules/testbook { }; testcontainers = callPackage ../development/python-modules/testcontainers { }; From d98677027dc02b6b1794a97887e8f118d3339686 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 29 Apr 2025 09:33:36 +0200 Subject: [PATCH 2/4] python312Packages.anytree: 2.12.1 -> 2.13.0 Diff: https://github.com/c0fec0de/anytree/compare/refs/tags/2.12.1...refs/tags/2.13.0 Changelog: https://github.com/c0fec0de/anytree/releases/tag/2.13.0 --- .../python-modules/anytree/default.nix | 59 +++++++++---------- .../python-modules/anytree/graphviz.patch | 13 ---- 2 files changed, 28 insertions(+), 44 deletions(-) delete mode 100644 pkgs/development/python-modules/anytree/graphviz.patch diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix index 9483bf12dadc..a4b7b9254de3 100644 --- a/pkgs/development/python-modules/anytree/default.nix +++ b/pkgs/development/python-modules/anytree/default.nix @@ -2,62 +2,59 @@ lib, buildPythonPackage, fetchFromGitHub, - fontconfig, graphviz, - poetry-core, - pytest7CheckHook, - pythonOlder, - six, - replaceVars, - withGraphviz ? true, + + # build-system + pdm-backend, + + # tests + pytest-cov-stub, + pytestCheckHook, + pyyaml, + test2ref, + fontconfig, }: buildPythonPackage rec { pname = "anytree"; - version = "2.12.1"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + version = "2.13.0"; + pyproject = true; src = fetchFromGitHub { owner = "c0fec0de"; repo = "anytree"; tag = version; - hash = "sha256-5HU8kR3B2RHiGBraQ2FTgVtGHJi+Lha9U/7rpNsYCCI="; + hash = "sha256-kFNYJMWagpqixs84+AaNkh/28asLBJhibTP8LEEe4XY="; }; - patches = lib.optionals withGraphviz [ - (replaceVars ./graphviz.patch { - inherit graphviz; - }) - ]; - postPatch = '' - # drop [project.urls] section, poetry-core 2.0 compat issue - sed -i "/project\.urls/,+4d" pyproject.toml + substituteInPlace src/anytree/exporter/dotexporter.py \ + --replace-fail \ + 'cmd = ["dot"' \ + 'cmd = ["${lib.getExe' graphviz "dot"}"' ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ pdm-backend ]; - propagatedBuildInputs = [ six ]; - - nativeCheckInputs = [ pytest7CheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + pyyaml + test2ref + ]; # Tests print “Fontconfig error: Cannot load default config file” - preCheck = lib.optionalString withGraphviz '' + preCheck = '' export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf ''; - # Circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree - doCheck = withGraphviz; - pythonImportsCheck = [ "anytree" ]; - meta = with lib; { + meta = { description = "Powerful and Lightweight Python Tree Data Structure"; homepage = "https://github.com/c0fec0de/anytree"; changelog = "https://github.com/c0fec0de/anytree/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maitnainers; [ ]; + license = lib.licenses.asl20; + maintainers = with lib.maitnainers; [ ]; }; } diff --git a/pkgs/development/python-modules/anytree/graphviz.patch b/pkgs/development/python-modules/anytree/graphviz.patch deleted file mode 100644 index 583b60444e35..000000000000 --- a/pkgs/development/python-modules/anytree/graphviz.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/anytree/exporter/dotexporter.py b/anytree/exporter/dotexporter.py -index 9c10a68..209a952 100644 ---- a/anytree/exporter/dotexporter.py -+++ b/anytree/exporter/dotexporter.py -@@ -228,7 +228,7 @@ class DotExporter(object): - for line in self: - dotfile.write(("%s\n" % line).encode("utf-8")) - dotfile.flush() -- cmd = ["dot", dotfilename, "-T", fileformat, "-o", filename] -+ cmd = ["@graphviz@/bin/dot", dotfilename, "-T", fileformat, "-o", filename] - check_call(cmd) - try: - remove(dotfilename) From 36c0c11c6ebce89e6d7d83ff0c569a613ab4a05f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 29 Apr 2025 09:52:33 +0200 Subject: [PATCH 3/4] python312Packages.oelint-data: init at 1.0.10 --- .../python-modules/oelint-data/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/oelint-data/default.nix diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix new file mode 100644 index 000000000000..eda30fc39c76 --- /dev/null +++ b/pkgs/development/python-modules/oelint-data/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + oelint-parser, +}: + +buildPythonPackage rec { + pname = "oelint-data"; + version = "1.0.10"; + pyproject = true; + + src = fetchFromGitHub { + owner = "priv-kweihmann"; + repo = "oelint-data"; + tag = version; + hash = "sha256-lBy/aGxcmJ3v5f+0YAJtuk0IK4WpL5iFrgKjyoLswro="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + oelint-parser + ]; + + pythonImportsCheck = [ "oelint_data" ]; + + # No tests + doCheck = false; + + meta = { + description = "Data for oelint-adv"; + homepage = "https://github.com/priv-kweihmann/oelint-data"; + changelog = "https://github.com/priv-kweihmann/oelint-data/releases/tag/${version}"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cdff365e8b1f..2d107b7c8784 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10164,6 +10164,8 @@ self: super: with self; { odp-amsterdam = callPackage ../development/python-modules/odp-amsterdam { }; + oelint-data = callPackage ../development/python-modules/oelint-data { }; + oelint-parser = callPackage ../development/python-modules/oelint-parser { }; oemthermostat = callPackage ../development/python-modules/oemthermostat { }; From b6b6930180ad4bb113fa6b965ec22fae52e3ed9a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 29 Apr 2025 09:32:28 +0200 Subject: [PATCH 4/4] oelint-adv: 6.7.1 -> 7.2.6 Diff: https://github.com/priv-kweihmann/oelint-adv/compare/refs/tags/6.7.1...refs/tags/7.2.6 Changelog: https://github.com/priv-kweihmann/oelint-adv/releases/tag/7.2.6 --- pkgs/by-name/oe/oelint-adv/package.nix | 27 +++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix index ec6b6f5c2670..70746ccc5a3b 100644 --- a/pkgs/by-name/oe/oelint-adv/package.nix +++ b/pkgs/by-name/oe/oelint-adv/package.nix @@ -7,16 +7,24 @@ python3Packages.buildPythonApplication rec { pname = "oelint-adv"; - version = "6.7.1"; + version = "7.2.6"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-adv"; tag = version; - hash = "sha256-rJ1M5YRXcKbDEGhy0G+N2dGD3sx8KFUfLJSLthYQNtU="; + hash = "sha256-QNTC8jO6RjHNaHVNSqAoM1xAhYc35G5A7D0yfwmd6+U="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "--random-order-bucket=global" "" \ + --replace-fail "--random-order" "" \ + --replace-fail "--force-sugar" "" \ + --replace-fail "--old-summary" "" + ''; + build-system = with python3Packages; [ setuptools ]; @@ -25,6 +33,7 @@ python3Packages.buildPythonApplication rec { anytree argcomplete colorama + oelint-data oelint-parser urllib3 ]; @@ -50,20 +59,12 @@ python3Packages.buildPythonApplication rec { passthru.updateScript = nix-update-script { }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail "--random-order-bucket=global" "" \ - --replace-fail "--random-order" "" \ - --replace-fail "--force-sugar" "" \ - --replace-fail "--old-summary" "" - ''; - - meta = with lib; { + meta = { description = "Advanced bitbake-recipe linter"; mainProgram = "oelint-adv"; homepage = "https://github.com/priv-kweihmann/oelint-adv"; changelog = "https://github.com/priv-kweihmann/oelint-adv/releases/tag/${version}"; - license = licenses.bsd2; - maintainers = with maintainers; [ otavio ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ otavio ]; }; }