Unverified Commit e82c2f43 authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

python3Packages.tree-sitter: run tests by using GH source (#450602)

parents 1cd8d446 447150af

pkgs/by-name/ke/keymap-drawer/package.nix

+26 −2
Original line number Diff line number Diff line 
{

  python3Packages,

  python3,

  fetchFromGitHub,

}:

python3Packages.toPythonApplication python3Packages.keymap-drawer
 


let

  python = python3.override {

    packageOverrides = self: super: {

      tree-sitter = super.tree-sitter.overrideAttrs {

        version = "0.24.0";

        src = fetchFromGitHub {

          owner = "tree-sitter";

          repo = "py-tree-sitter";

          tag = "v0.24.0";

          hash = "sha256-ZDt/8suteaAjGdk71l8eej7jDkkVpVDBIZS63SA8tsU=";

          fetchSubmodules = true;

        };

        # keymap-drawer only requires tree-sitter-devicetree grammer, and

        # the tests fail with numereous TREE_SITTER_LANGUAGE_VERSION

        # related failures related to other grammers. Hence we disable the

        # tests altogether, hoping that in the future this python3.override

        # won't be needed at all.

        doInstallCheck = false;

      };

    };

  };

in

python.pkgs.toPythonApplication python.pkgs.keymap-drawer

pkgs/development/python-modules/keymap-drawer/default.nix

+6 −11
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 


  buildPythonPackage,

  fetchFromGitHub,

  fetchPypi,

  pythonOlder,



  nix-update-script,
@@ -47,16 +46,7 @@ buildPythonPackage { 
    pydantic-settings

    pyparsing

    pyyaml

    # keymap-drawer currently requires tree-sitter 0.24.0

    # See https://github.com/caksoylar/keymap-drawer/issues/183

    (tree-sitter.overrideAttrs rec {

      version = "0.24.0";

      src = fetchPypi {

        inherit version;

        inherit (tree-sitter) pname;

        hash = "sha256-q9la9lyi9Pfso1Y0M5HtZp52Tzd0i1NSlG8A9/x45zQ=";

      };

    })

    tree-sitter

    tree-sitter-grammars.tree-sitter-devicetree

  ];
@@ -80,5 +70,10 @@ buildPythonPackage { 
      MattSturgeon

    ];

    mainProgram = "keymap";

    # keymap-drawer currently requires tree-sitter 0.24.0

    # See https://github.com/caksoylar/keymap-drawer/issues/183

    # top-level package `keymap-drawer` is not broken due to this

    # incompatibility, thanks to a Python override

    broken = lib.versionAtLeast tree-sitter.version "0.25.0";

  };

}

pkgs/development/python-modules/tree-sitter/default.nix

+37 −5
Original line number Diff line number Diff line 
{

  lib,

  buildPythonPackage,

  fetchPypi,

  fetchFromGitHub,



  # build-system

  setuptools,



  # tests

  pytestCheckHook,

  tree-sitter-python,

  tree-sitter-rust,

  tree-sitter-html,

  tree-sitter-javascript,

  tree-sitter-json,

}:



buildPythonPackage rec {
@@ -12,19 +20,43 @@ buildPythonPackage rec { 
  version = "0.25.2";

  pyproject = true;



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-/kPBWFVdpGcjsotS4FitREGVr9HbPKdyDFmiVFROnCA=";

  src = fetchFromGitHub {

    owner = "tree-sitter";

    repo = "py-tree-sitter";

    tag = "v${version}";

    hash = "sha256-MgiVxq9MUaOkNNgn46g2Cy7/IUx/yatKSR1vE6LscKg=";

    fetchSubmodules = true;

  };



  build-system = [ setuptools ];



  nativeCheckInputs = [

    pytestCheckHook

    tree-sitter-python

    tree-sitter-rust

    tree-sitter-html

    tree-sitter-javascript

    tree-sitter-json

  ];



  pythonImportsCheck = [ "tree_sitter" ];



  preCheck = ''

    # https://github.com/NixOS/nixpkgs/issues/255262#issuecomment-1721265871

    rm -r tree_sitter

  '';



  disabledTests = [

    # Test fails only in the Nix sandbox, with:

    #

    #    AssertionError: Lists differ: ['', '', ''] != ['graph {\n', 'label="new_parse"\n', '}\n']

    "test_dot_graphs"

  ];



  meta = {

    description = "Python bindings to the Tree-sitter parsing library";

    homepage = "https://github.com/tree-sitter/py-tree-sitter";

    changelog = "https://github.com/tree-sitter/py-tree-sitter/releases/tag/v${version}";

    changelog = "https://github.com/tree-sitter/py-tree-sitter/releases/tag/${src.tag}";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ fab ];

  };