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

Merge pull request #287419 from fabaff/pycfmodel-bump 

python311Packages.pycfmodel: 0.21.2 -> 0.22.0, cfripper: 1.15.2 -> 1.15.3
parents f9d6b144 c6e46679

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

+4 −5
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
, buildPythonPackage

, fetchFromGitHub

, httpx

, pydantic

, pydantic_1

, pytestCheckHook

, pythonOlder

, setuptools
@@ -10,7 +10,7 @@ 


buildPythonPackage rec {

  pname = "pycfmodel";

  version = "0.21.2";

  version = "0.22.0";

  pyproject = true;



  disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec { 
    owner = "Skyscanner";

    repo = "pycfmodel";

    rev = "refs/tags/v${version}";

    hash = "sha256-nQIZ9fwk8CdqJawYsU5qiu9xxhi9X0IxhlPohHUDTL8=";

    hash = "sha256-NLi94W99LhrBXNFItMfJczV9EZlgvmvkavrfDQJs0YU=";

  };



  nativeBuildInputs = [
@@ -27,7 +27,7 @@ buildPythonPackage rec { 
  ];



  propagatedBuildInputs = [

    pydantic

    pydantic_1

  ];



  nativeCheckInputs = [
@@ -54,6 +54,5 @@ buildPythonPackage rec { 
    changelog = "https://github.com/Skyscanner/pycfmodel/releases/tag/v${version}";

    license = licenses.asl20;

    maintainers = with maintainers; [ fab ];

    broken = versionAtLeast pydantic.version "2";

  };

}

pkgs/tools/security/cfripper/default.nix

+14 −10
Original line number Diff line number Diff line
@@ -5,15 +5,25 @@ 


python3.pkgs.buildPythonApplication rec {

  pname = "cfripper";

  version = "1.15.2";

  version = "1.15.3";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "Skyscanner";

    repo = pname;

    rev = "refs/tags/${version}";

    repo = "cfripper";

    rev = "refs/tags/v${version}";

    hash = "sha256-SmD3Dq5LicPRe3lWFsq4zqM/yDZ1LsgRwSUA5/RbN9I=";

  };



  postPatch = ''

    substituteInPlace setup.py \

      --replace "pluggy~=0.13.1" "pluggy" \

  '';



  nativeBuildInputs = with python3.pkgs; [

    setuptools

  ];



  propagatedBuildInputs = with python3.pkgs; [

    boto3

    cfn-flip
@@ -30,13 +40,6 @@ python3.pkgs.buildPythonApplication rec { 
    pytestCheckHook

  ];



  postPatch = ''

    substituteInPlace setup.py \

      --replace "click~=7.1.1" "click" \

      --replace "pluggy~=0.13.1" "pluggy" \

      --replace "pydash~=4.7.6" "pydash"

  '';



  disabledTestPaths = [

    # Tests are failing

    "tests/test_boto3_client.py"
@@ -55,6 +58,7 @@ python3.pkgs.buildPythonApplication rec { 
  meta = with lib; {

    description = "Tool for analysing CloudFormation templates";

    homepage = "https://github.com/Skyscanner/cfripper";

    changelog = "https://github.com/Skyscanner/cfripper/releases/tag/v${version}";

    license = with licenses; [ asl20 ];

    maintainers = with maintainers; [ fab ];

  };