pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #154876 from fabaff/bump-cyclonedx-python-lib

python3Packages.cyclonedx-python-lib: 0.12.3 -> 1.0.0

authored by

Fabian Affolter and committed by
GitHub 40b78f15 d4c2294a

+54 -29
+3 -2
pkgs/development/python-modules/cloudsplaining/default.nix
··· 17 17 18 18 buildPythonPackage rec { 19 19 pname = "cloudsplaining"; 20 - version = "0.4.9"; 20 + version = "0.4.10"; 21 + format = "setuptools"; 21 22 22 23 disabled = pythonOlder "3.6"; 23 24 ··· 25 26 owner = "salesforce"; 26 27 repo = pname; 27 28 rev = version; 28 - sha256 = "sha256-87ZUYHN64gnbF2g9BjPFNbwMaGFxAy3Yb8UdT3BUqC0="; 29 + hash = "sha256-zTsqrHu8eQsQ4ZFocvHdVsgCjWE6JVrlyaztFNir2fk="; 29 30 }; 30 31 31 32 propagatedBuildInputs = [
+18 -5
pkgs/development/python-modules/contextlib2/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchPypi 4 - , unittest2 4 + , python 5 + , pythonOlder 5 6 }: 6 7 7 8 buildPythonPackage rec { 8 9 pname = "contextlib2"; 9 10 version = "21.6.0"; 11 + format = "setuptools"; 12 + 13 + disabled = pythonOlder "3.6"; 10 14 11 15 src = fetchPypi { 12 16 inherit pname version; 13 - sha256 = "ab1e2bfe1d01d968e1b7e8d9023bc51ef3509bba217bb730cee3827e1ee82869"; 17 + hash = "sha256-qx4r/h0B2Wjht+jZAjvFHvNQm7ohe7cwzuOCfh7oKGk="; 14 18 }; 15 19 16 - checkInputs = [ unittest2 ]; 20 + checkPhase = '' 21 + runHook preCheck 22 + ${python.interpreter} -m unittest discover 23 + runHook postCheck 24 + ''; 25 + 26 + pythonImportsCheck = [ 27 + "contextlib2" 28 + ]; 17 29 18 - meta = { 30 + meta = with lib; { 19 31 description = "Backports and enhancements for the contextlib module"; 20 32 homepage = "https://contextlib2.readthedocs.org/"; 21 - license = lib.licenses.psfl; 33 + license = licenses.psfl; 34 + maintainers = with maintainers; [ ]; 22 35 }; 23 36 }
+6 -10
pkgs/development/python-modules/cyclonedx-python-lib/default.nix
··· 2 2 , buildPythonPackage 3 3 , fetchFromGitHub 4 4 , importlib-metadata 5 + , jsonschema 6 + , lxml 5 7 , packageurl-python 6 8 , poetry-core 7 9 , pytestCheckHook ··· 11 13 , toml 12 14 , types-setuptools 13 15 , types-toml 14 - , tox 15 16 }: 16 17 17 18 buildPythonPackage rec { 18 19 pname = "cyclonedx-python-lib"; 19 - version = "0.12.3"; 20 + version = "1.0.0"; 20 21 format = "pyproject"; 21 22 22 23 disabled = pythonOlder "3.6"; ··· 25 26 owner = "CycloneDX"; 26 27 repo = pname; 27 28 rev = "v${version}"; 28 - sha256 = "1404wcwjglq025n8ncsrl2h64g1sly83cs9sc6jpiw1g5ay4a1vi"; 29 + hash = "sha256-BEug6F0uerkLoVJbJF19YIF96Xs2vJET2BUJFi9A5Qo="; 29 30 }; 30 31 31 32 nativeBuildInputs = [ ··· 43 44 ]; 44 45 45 46 checkInputs = [ 47 + jsonschema 48 + lxml 46 49 pytestCheckHook 47 - tox 48 50 ]; 49 - 50 - postPatch = '' 51 - substituteInPlace pyproject.toml \ 52 - --replace 'setuptools = "^50.3.2"' 'setuptools = "*"' \ 53 - --replace 'importlib-metadata = "^4.8.1"' 'importlib-metadata = "*"' 54 - ''; 55 51 56 52 pythonImportsCheck = [ 57 53 "cyclonedx"
+23 -10
pkgs/development/python-modules/schema/default.nix
··· 1 - { lib, buildPythonPackage, fetchPypi, contextlib2, pytest, mock }: 1 + { lib 2 + , buildPythonPackage 3 + , contextlib2 4 + , fetchPypi 5 + , mock 6 + , pytestCheckHook 7 + , pythonOlder 8 + }: 2 9 3 10 buildPythonPackage rec { 4 - 5 11 pname = "schema"; 6 12 version = "0.7.5"; 13 + format = "setuptools"; 14 + 15 + disabled = pythonOlder "3.6"; 7 16 8 17 src = fetchPypi { 9 18 inherit pname version; 10 - sha256 = "f06717112c61895cabc4707752b88716e8420a8819d71404501e114f91043197"; 19 + hash = "sha256-8GcXESxhiVyrxHB3UriHFuhCCogZ1xQEUB4RT5EEMZc="; 11 20 }; 12 21 13 - preConfigure = '' 14 - substituteInPlace requirements.txt --replace '==' '>=' 15 - ''; 22 + propagatedBuildInputs = [ 23 + contextlib2 24 + ]; 16 25 17 - propagatedBuildInputs = [ contextlib2 ]; 26 + checkInputs = [ 27 + mock 28 + pytestCheckHook 29 + ]; 18 30 19 - checkInputs = [ pytest mock ]; 20 - checkPhase = "pytest ./test_schema.py"; 31 + pythonImportsCheck = [ 32 + "schema" 33 + ]; 21 34 22 35 meta = with lib; { 23 36 description = "Library for validating Python data structures"; 24 37 homepage = "https://github.com/keleshev/schema"; 25 38 license = licenses.mit; 26 - maintainers = [ maintainers.tobim ]; 39 + maintainers = with maintainers; [ tobim ]; 27 40 }; 28 41 }
+4 -2
pkgs/development/tools/analysis/checkov/default.nix
··· 22 22 23 23 buildPythonApplication rec { 24 24 pname = "checkov"; 25 - version = "2.0.710"; 25 + version = "2.0.712"; 26 26 27 27 src = fetchFromGitHub { 28 28 owner = "bridgecrewio"; 29 29 repo = pname; 30 30 rev = version; 31 - hash = "sha256-8cvnCGqfS4ToDhjMsCpMf+d6V8gSmSJeGsoL4Q5hgFM="; 31 + hash = "sha256-iUplSd4/OcJtfby2bn7b6GwCbXnBMqUSuLjkkh+7W9Y="; 32 32 }; 33 33 34 34 nativeBuildInputs = with py.pkgs; [ ··· 89 89 "api_key" 90 90 # Requires network access 91 91 "TestSarifReport" 92 + # Will probably be fixed in one of the next releases 93 + "test_valid_cyclonedx_bom" 92 94 ]; 93 95 94 96 disabledTestPaths = [