Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4c5f09d916ec
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 89259458bfb6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 1, 2021

  1. pythonPackages.cfn-lint: 0.35.1 -> 0.42.0

    @endgame @SuperSandro2000
    endgame authored and SuperSandro2000 committed Jan 1, 2021
    Copy the full SHA
    87453c2 View commit details

  2. Merge pull request #105658 from endgame/cfn-lint-bump

    @SuperSandro2000
    SuperSandro2000 authored Jan 1, 2021
    Copy the full SHA
    8925945 View commit details
Showing with 21 additions and 9 deletions.
  1. +21 −9 pkgs/development/python-modules/cfn-lint/default.nix
30 changes: 21 additions & 9 deletions pkgs/development/python-modules/cfn-lint/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,25 +14,25 @@
, requests
, setuptools
, six
# Test inputs
, pytestCheckHook
, mock
, pydot
, pytestCheckHook
}:

buildPythonPackage rec {
pname = "cfn-lint";
version = "0.35.1";
version = "0.42.0";

src = fetchFromGitHub {
owner = "aws-cloudformation";
repo = "cfn-python-lint";
repo = "cfn-python-lint";
rev = "v${version}";
sha256 = "1ajb0412hw9fg9m4b3xbpfbp8cixmnpjxrkaks6k749xinzsv7qk";
sha256 = "0cqpq7pxpslpd7am6mp6nmwhsb2p2a5lq3hjjxi8imv3wv7zql98";
};

postPatch = ''
substituteInPlace setup.py --replace 'importlib_resources~=1.4;python_version<"3.7" and python_version!="3.4"' 'importlib_resources;python_version<"3.7"'
substituteInPlace setup.py \
--replace 'importlib_resources~=1.4;python_version<"3.7" and python_version!="3.4"' 'importlib_resources;python_version<"3.7"'
'';

propagatedBuildInputs = [
@@ -48,6 +48,21 @@ buildPythonPackage rec {
six
] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata importlib-resources ];

checkInputs = [
mock
pydot
pytestCheckHook
];

preCheck = ''
export PATH=$out/bin:$PATH
'';

disabledTests = [
# requires git directory
"test_update_docs"
];

pythonImportsCheck = [
"cfnlint"
"cfnlint.conditions"
@@ -64,9 +79,6 @@ buildPythonPackage rec {
"cfnlint.transform"
];

checkInputs = [ pytestCheckHook mock pydot ];
preCheck = "export PATH=$out/bin:$PATH";

meta = with lib; {
description = "Checks cloudformation for practices and behaviour that could potentially be improved";
homepage = "https://github.com/aws-cloudformation/cfn-python-lint";