From 7eca5b29dafe3eee62fb7c3bf317a88e6002db0a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Jan 2022 12:17:21 +0100 Subject: [PATCH 1/5] python3Packages.cyclonedx-python-lib: 0.12.3 -> 1.0.0 --- .../cyclonedx-python-lib/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 75f9c29607da..4c3d9cd4f195 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchFromGitHub , importlib-metadata +, jsonschema +, lxml , packageurl-python , poetry-core , pytestCheckHook @@ -11,12 +13,11 @@ , toml , types-setuptools , types-toml -, tox }: buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "0.12.3"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "v${version}"; - sha256 = "1404wcwjglq025n8ncsrl2h64g1sly83cs9sc6jpiw1g5ay4a1vi"; + hash = "sha256-BEug6F0uerkLoVJbJF19YIF96Xs2vJET2BUJFi9A5Qo="; }; nativeBuildInputs = [ @@ -43,16 +44,11 @@ buildPythonPackage rec { ]; checkInputs = [ + jsonschema + lxml pytestCheckHook - tox ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'setuptools = "^50.3.2"' 'setuptools = "*"' \ - --replace 'importlib-metadata = "^4.8.1"' 'importlib-metadata = "*"' - ''; - pythonImportsCheck = [ "cyclonedx" ]; From a23dd4d2f6b502da002260a6cce52507c80842ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Jan 2022 12:29:10 +0100 Subject: [PATCH 2/5] python3Packages.cloudsplaining: 0.4.9 -> 0.4.10 --- pkgs/development/python-modules/cloudsplaining/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix index 23c911f8e4a6..13720f9d88bc 100644 --- a/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/pkgs/development/python-modules/cloudsplaining/default.nix @@ -17,7 +17,8 @@ buildPythonPackage rec { pname = "cloudsplaining"; - version = "0.4.9"; + version = "0.4.10"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = pname; rev = version; - sha256 = "sha256-87ZUYHN64gnbF2g9BjPFNbwMaGFxAy3Yb8UdT3BUqC0="; + hash = "sha256-zTsqrHu8eQsQ4ZFocvHdVsgCjWE6JVrlyaztFNir2fk="; }; propagatedBuildInputs = [ From 4f45adf0e438590788573fb0e8a6be543ec89ec1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Jan 2022 13:09:52 +0100 Subject: [PATCH 3/5] checkov: 2.0.710 -> 2.0.712 --- pkgs/development/tools/analysis/checkov/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index b785dd50900d..3ddde0c282f9 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,13 +22,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.710"; + version = "2.0.712"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-8cvnCGqfS4ToDhjMsCpMf+d6V8gSmSJeGsoL4Q5hgFM="; + hash = "sha256-iUplSd4/OcJtfby2bn7b6GwCbXnBMqUSuLjkkh+7W9Y="; }; nativeBuildInputs = with py.pkgs; [ @@ -89,6 +89,8 @@ buildPythonApplication rec { "api_key" # Requires network access "TestSarifReport" + # Will probably be fixed in one of the next releases + "test_valid_cyclonedx_bom" ]; disabledTestPaths = [ From b014866de5561e6b4df4a047ddc4ec1c862fadee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Jan 2022 13:21:57 +0100 Subject: [PATCH 4/5] python3Packages.contextlib2: update check section --- .../python-modules/contextlib2/default.nix | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix index 1387e786e7b7..6aea2570cb87 100644 --- a/pkgs/development/python-modules/contextlib2/default.nix +++ b/pkgs/development/python-modules/contextlib2/default.nix @@ -1,23 +1,36 @@ { lib , buildPythonPackage , fetchPypi -, unittest2 +, python +, pythonOlder }: buildPythonPackage rec { pname = "contextlib2"; version = "21.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "ab1e2bfe1d01d968e1b7e8d9023bc51ef3509bba217bb730cee3827e1ee82869"; + hash = "sha256-qx4r/h0B2Wjht+jZAjvFHvNQm7ohe7cwzuOCfh7oKGk="; }; - checkInputs = [ unittest2 ]; + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck + ''; - meta = { + pythonImportsCheck = [ + "contextlib2" + ]; + + meta = with lib; { description = "Backports and enhancements for the contextlib module"; homepage = "https://contextlib2.readthedocs.org/"; - license = lib.licenses.psfl; + license = licenses.psfl; + maintainers = with maintainers; [ ]; }; } From d76a2e59297d23af97942361a04c405e0bf4e08b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Jan 2022 13:25:41 +0100 Subject: [PATCH 5/5] python3Packages.schema: switch to pytestCheckHook --- .../python-modules/schema/default.nix | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix index 3ace46489db5..dabe046e4861 100644 --- a/pkgs/development/python-modules/schema/default.nix +++ b/pkgs/development/python-modules/schema/default.nix @@ -1,28 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi, contextlib2, pytest, mock }: +{ lib +, buildPythonPackage +, contextlib2 +, fetchPypi +, mock +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { - pname = "schema"; version = "0.7.5"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f06717112c61895cabc4707752b88716e8420a8819d71404501e114f91043197"; + hash = "sha256-8GcXESxhiVyrxHB3UriHFuhCCogZ1xQEUB4RT5EEMZc="; }; - preConfigure = '' - substituteInPlace requirements.txt --replace '==' '>=' - ''; + propagatedBuildInputs = [ + contextlib2 + ]; - propagatedBuildInputs = [ contextlib2 ]; + checkInputs = [ + mock + pytestCheckHook + ]; - checkInputs = [ pytest mock ]; - checkPhase = "pytest ./test_schema.py"; + pythonImportsCheck = [ + "schema" + ]; meta = with lib; { description = "Library for validating Python data structures"; homepage = "https://github.com/keleshev/schema"; license = licenses.mit; - maintainers = [ maintainers.tobim ]; + maintainers = with maintainers; [ tobim ]; }; }