Unverified Commit 45d072bd authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

python313Packages.recline: fix build (#379877)

parents 26de8390 d320749a

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

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

  lib,

  buildPythonPackage,

  hatchling,

  fetchPypi,

  setuptools,

  jedi,

  packaging,

  pygments,
@@ -25,7 +25,7 @@ buildPythonPackage rec { 
    hash = "sha256-Jk8jngU45S6D09AgFDEAsxccrhcidnS7G5+LB180hJw=";

  };



  build-system = [ setuptools ];

  build-system = [ hatchling ];



  dependencies = [

    jedi

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

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

  lib,

  argcomplete,

  buildPythonPackage,

  fetchFromGitHub,

  pudb,
@@ -10,7 +11,7 @@ 
buildPythonPackage rec {

  pname = "recline";

  version = "2024.7.1";

  format = "pyproject";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "NetApp";
@@ -19,7 +20,18 @@ buildPythonPackage rec { 
    sha256 = "sha256-Qc4oofuhSZ2S5zuCY9Ce9ISldYI3MDUJXFc8VcXdLIU=";

  };



  nativeBuildInputs = [ setuptools ];

  patches = [

    # based on https://github.com/NetApp/recline/pull/21

    ./devendor.patch

  ];



  postPatch = ''

    rm -r recline/vendor/argcomplete

  '';



  build-system = [ setuptools ];



  dependencies = [ argcomplete ];



  nativeCheckInputs = [

    pudb

pkgs/development/python-modules/recline/devendor.patch

0 → 100644
+38 −0
Original line number Diff line number Diff line 
commit 6ea5c039671de2547249c36ca3e1fb51fc4a7e06

Author: Sandro Jäckel <sandro.jaeckel@gmail.com>

Date:   Thu Feb 6 18:33:28 2025 +0100



    Devendor argcomplete



diff --git a/pyproject.toml b/pyproject.toml

index 5ac5cab..6b60188 100644

--- a/pyproject.toml

+++ b/pyproject.toml

@@ -21,6 +21,7 @@ packages = [

 ]

 

 [tool.poetry.dependencies]

+argcomplete = "*"

 python = ">=3.9.0,<4"

 windows-curses = {version = "^2.3.3", markers = "sys_platform == 'win32'"}

 pyreadline3 = {version = "^3.4.1", markers = "sys_platform == 'win32'"}

diff --git a/recline/repl/completer.py b/recline/repl/completer.py

index ff35583..1a05ae3 100644

--- a/recline/repl/completer.py

+++ b/recline/repl/completer.py

@@ -5,6 +5,7 @@

 as argument names and values.

 """

 

+import argcomplete

 import argparse

 import re

 import readline

@@ -12,7 +13,6 @@

 

 import recline

 from recline.arg_types.recline_type import UniqueParam

-from recline.vendor import argcomplete

 

 

 def match_command_hook(substitution, matches, *_):