Unverified Commit 76e387b0 authored by OTABI Tomoya's avatar OTABI Tomoya Committed by GitHub
Browse files

python312Packages.{localstack-ext,localstack}: fix build and refactor (#354962)

parents d056782c 494908f0

pkgs/development/python-modules/localstack-ext/default.nix

+21 −18
Original line number Diff line number Diff line
@@ -2,13 +2,17 @@ 
  lib,

  buildPythonPackage,

  fetchPypi,

  setuptools,

  setuptools-scm,

  dill,

  dnslib,

  dnspython,

  plux,

  pyaes,

  pyotp,

  python-jose,

  requests,

  python-dateutil,

  tabulate,



  # Sensitive downstream dependencies
@@ -18,7 +22,7 @@ 
buildPythonPackage rec {

  pname = "localstack-ext";

  version = "3.7.2";

  format = "setuptools";

  pyproject = true;



  src = fetchPypi {

    pname = "localstack_ext";
@@ -26,32 +30,31 @@ buildPythonPackage rec { 
    hash = "sha256-gd+HyZnezgtKrSKJOYtxUZHTPMrrpKWQHGvaIs9FyVs=";

  };



  postPatch = ''

    # Avoid circular dependency

    sed -i '/localstack>=/d' setup.cfg



    # Pip is unable to resolve attr logic, so it will emit version as 0.0.0

    substituteInPlace setup.cfg \

      --replace "version = attr: localstack_ext.__version__" "version = ${version}"

    cat setup.cfg

  build-system = [

    setuptools

    setuptools-scm

  ];



    substituteInPlace setup.cfg \

      --replace "dill==0.3.2" "dill~=0.3.0" \

      --replace "requests>=2.20.0,<2.26" "requests~=2.20"

  '';

  pythonRemoveDeps = [

    # Avoid circular dependency

    "localstack"

    "build"

  ];



  propagatedBuildInputs = [

  dependencies = [

    dill

    dnslib

    dnspython

    plux

    pyaes

    pyotp

    python-jose

    requests

    tabulate

  ];

    python-dateutil

  ] ++ python-jose.optional-dependencies.cryptography;



  pythonImportsCheck = [ "localstack_ext" ];

  pythonImportsCheck = [ "localstack" ];



  # No tests in repo

  doCheck = false;
@@ -60,10 +63,10 @@ buildPythonPackage rec { 
    inherit localstack;

  };



  meta = with lib; {

  meta = {

    description = "Extensions for LocalStack";

    homepage = "https://github.com/localstack/localstack";

    license = licenses.asl20;

    license = lib.licenses.asl20;

    maintainers = [ ];

  };

}

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

+5 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
  rich,

  semver,

  setuptools,

  setuptools-scm,

  tailer,

}:
@@ -34,7 +35,10 @@ buildPythonPackage rec { 
    hash = "sha256-8xdP/qpmfqmXDt1gNhzkAGlBR6dJYznKr9+/Un6N7mA=";

  };



  build-system = [ setuptools ];

  build-system = [

    setuptools

    setuptools-scm

  ];



  dependencies = [

    apispec