From 49d00dd6d6461587f51bbf2fae4c233b0e092634 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 10:42:52 +0200 Subject: [PATCH 1/3] python311Packages.anytree: 2.8.0 -> 2.9.0 Diff: https://github.com/c0fec0de/anytree/compare/refs/tags/2.8.0...2.9.0 Changelog: https://github.com/c0fec0de/anytree/releases/tag/2.9.0 --- .../python-modules/anytree/default.nix | 51 +++++++++++-------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix index d49b22349639..a83d8748d477 100644 --- a/pkgs/development/python-modules/anytree/default.nix +++ b/pkgs/development/python-modules/anytree/default.nix @@ -1,24 +1,28 @@ { lib , buildPythonPackage -, fetchPypi -, pythonOlder -, substituteAll -, six -, withGraphviz ? true -, graphviz +, fetchFromGitHub , fontconfig -# Tests +, graphviz +, poetry-core , pytestCheckHook -, nose +, pythonOlder +, six +, substituteAll +, withGraphviz ? true }: buildPythonPackage rec { pname = "anytree"; - version = "2.8.0"; + version = "2.9.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "c0fec0de"; + repo = "anytree"; + rev = "refs/tags/${version}"; + hash = "sha256-e7mmOOvrZuMCcyUg74YLLXGzkb5nCtuYmhNzAbY65gg="; }; patches = lib.optionals withGraphviz [ @@ -28,30 +32,35 @@ buildPythonPackage rec { }) ]; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ six ]; - # tests print “Fontconfig error: Cannot load default config file” + nativeCheckInputs = [ + pytestCheckHook + ]; + + # Tests print “Fontconfig error: Cannot load default config file” preCheck = lib.optionalString withGraphviz '' export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf ''; - # circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree + # Circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree doCheck = withGraphviz; - nativeCheckInputs = [ pytestCheckHook nose ]; - - pytestFlagsArray = lib.optionals (pythonOlder "3.4") [ - # Use enums, which aren't available pre-python3.4 - "--ignore=tests/test_resolver.py" - "--ignore=tests/test_search.py" + pythonImportsCheck = [ + "anytree" ]; meta = with lib; { 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 = [ ]; + maintainers = with maitnainers; [ ]; }; } From f036cc78a5dcf1e4f312b17aadc7953a146cadc5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 12:49:24 +0200 Subject: [PATCH 2/3] python311Packages.types-docopt: init at 0.6.11.4 --- .../python-modules/types-docopt/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/types-docopt/default.nix diff --git a/pkgs/development/python-modules/types-docopt/default.nix b/pkgs/development/python-modules/types-docopt/default.nix new file mode 100644 index 000000000000..7c1128efb840 --- /dev/null +++ b/pkgs/development/python-modules/types-docopt/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-docopt"; + version = "0.6.11.4"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-mRpkwVaTEMIkCuc0/SwQYnq7ikr6875axvTv+aYB8xo="; + }; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "docopt-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for docopt"; + homepage = "https://pypi.org/project/types-docopt/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e3225440d0e..4ac1ee10eb6c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13132,6 +13132,8 @@ self: super: with self; { types-deprecated = callPackage ../development/python-modules/types-deprecated { }; + types-docopt = callPackage ../development/python-modules/types-docopt { }; + types-docutils = callPackage ../development/python-modules/types-docutils { }; types-enum34 = callPackage ../development/python-modules/types-enum34 { }; From c1bb32ee723b7dfe84d643cb93cb0c62092b6cc1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Aug 2023 12:50:17 +0200 Subject: [PATCH 3/3] catcli: 0.8.7 -> 0.9.6 Diff: https://github.com/deadc0de6/catcli/compare/refs/tags/v0.8.7...v0.9.6 Changelog: https://github.com/deadc0de6/catcli/releases/tag/v0.9.6 --- pkgs/tools/filesystems/catcli/default.nix | 26 ++++++++++++++++------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix index eedbdcc22285..a2f5402dca25 100644 --- a/pkgs/tools/filesystems/catcli/default.nix +++ b/pkgs/tools/filesystems/catcli/default.nix @@ -1,28 +1,38 @@ { lib , fetchFromGitHub -, buildPythonApplication -, docopt, anytree +, python3 }: -buildPythonApplication rec { - +python3.pkgs.buildPythonApplication rec { pname = "catcli"; - version = "0.8.7"; + version = "0.9.6"; + format = "setuptools"; src = fetchFromGitHub { owner = "deadc0de6"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-hVunxgc/aUapQYe6k3hKdkC+2Jw0x1HjI/kl/fJdWUo="; + hash = "sha256-+/kd7oPT6msojPj25bzG9HwVqPj47gIUg9LngbDc3y8="; }; - propagatedBuildInputs = [ docopt anytree ]; - postPatch = "patchShebangs . "; + propagatedBuildInputs = with python3.pkgs; [ + anytree + docopt + fusepy + pyfzf + types-docopt + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ]; + meta = with lib; { description = "The command line catalog tool for your offline data"; homepage = "https://github.com/deadc0de6/catcli"; + changelog = "https://github.com/deadc0de6/catcli/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ petersjt014 ]; platforms = platforms.all;