Unverified Commit 26b0107a authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #251552 from fabaff/anytree-bump 

python311Packages.anytree: 2.8.0 -> 2.9.0
parents 5c867e90 c1bb32ee

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

+29 −20
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchPypi

, fetchFromGitHub

, fontconfig

, graphviz

, poetry-core

, pytestCheckHook

, pythonOlder

, substituteAll

, six

, substituteAll

, withGraphviz ? true

, graphviz

, fontconfig

# Tests

, pytestCheckHook

, nose

}:



buildPythonPackage rec {

  pname = "anytree";

  version = "2.8.0";

  version = "2.9.0";

  format = "pyproject";



  disabled = pythonOlder "3.7";



  src = fetchPypi {

    inherit pname version;

    sha256 = "3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab";

  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; [ ];

  };

}

pkgs/development/python-modules/types-docopt/default.nix

0 → 100644
+29 −0
Original line number Diff line number Diff line 
{ 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 ];

  };

}

pkgs/tools/filesystems/catcli/default.nix

+18 −8
Original line number Diff line number Diff line 
{ 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;

pkgs/top-level/python-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -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 { };