Unverified Commit 8753c7c1 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #306878 from mweinelt/localstack-fix

Revert localstack back to 3.0.0
parents 16249a51 92bc73ff
Loading
Loading
Loading
Loading
+10 −34
Original line number Diff line number Diff line
{ lib
, buildPythonPackage
, fetchPypi

# build-system
, setuptools
, plux

# dependencies
, cachetools
, click
, cryptography
, dill
, dnslib
, dnspython
, psutil
, python-dotenv
, pyyaml
, plux
, pyaes
, python-jose
, requests
, rich
, semver
, stevedore
, tailer
, tabulate

# Sensitive downstream dependencies
, localstack
@@ -28,12 +16,12 @@

buildPythonPackage rec {
  pname = "localstack-ext";
  version = "3.2.0";
  pyproject = true;
  version = "2.3.2";
  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-53pbt7kNaYQRsLb+OI8gLwR3cBE18ZKLZmG4aP1/93E=";
    hash = "sha256-Ex5ZPlteDaiyex90QumucVdTTbpp9uWiBrvw1kMr++8=";
  };

  postPatch = ''
@@ -50,27 +38,15 @@ buildPythonPackage rec {
      --replace "requests>=2.20.0,<2.26" "requests~=2.20"
  '';

  nativeBuildInputs = [
    plux
    setuptools
  ];

  propagatedBuildInputs = [
    cachetools
    click
    cryptography
    dill
    dnslib
    dnspython
    plux
    psutil
    python-dotenv
    pyyaml
    rich
    pyaes
    python-jose
    requests
    semver
    stevedore
    tailer
    tabulate
  ];

  pythonImportsCheck = [ "localstack_ext" ];
+3 −8
Original line number Diff line number Diff line
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools
, apispec
, boto3
, cachetools
@@ -21,14 +20,14 @@

buildPythonPackage rec {
  pname = "localstack";
  version = "3.2.0";
  pyproject = true;
  version = "3.0.0";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = "localstack";
    repo = "localstack";
    rev = "refs/tags/v${version}";
    hash = "sha256-r0KRPtsLr6Pyn/va93reLdHHKtiOLB1uflAJ2L/uZmU=";
    hash = "sha256-N/Mc1bubCcq38VxUqkO9LGG25pEetEyJ+VJMdg/7hrU=";
  };

  postPatch = ''
@@ -38,10 +37,6 @@ buildPythonPackage rec {
      --replace "boto3>=1.20,<1.25.0" "boto3~=1.20"
  '';

  nativeBuildInputs = [
    setuptools
  ];

  propagatedBuildInputs = [
    apispec
    boto3