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

Merge pull request #283574 from fabaff/cvss-bump 

python311Packages.cvss: 2.6 -> 3.0,  python311Packages.reptor: 0.7 -> 0.8
parents 27faaf70 49136bdc

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

+15 −18
Original line number Diff line number Diff line
@@ -2,47 +2,44 @@ 
, buildPythonPackage

, fetchFromGitHub

, jsonschema

, pytestCheckHook

, unittestCheckHook

, pythonOlder

, setuptools

}:



buildPythonPackage rec {

  pname = "cvss";

  version = "2.6";

  format = "setuptools";

  version = "3.0";

  pyproject = true;



  disabled = pythonOlder "3.7";



  src = fetchFromGitHub {

    owner = "RedHatProductSecurity";

    repo = pname;

    repo = "cvss";

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

    hash = "sha256-gD9MreJQPaxziy02Wt3BGFiIoQ/+pW3KqiNfNlTijJY=";

    hash = "sha256-xrkWpE13Y4KgQEZjitWE3Ka+IyfShqE2cj0/yzsAnX4=";

  };



  nativeBuildInputs = [

    setuptools

  ];



  nativeCheckInputs = [

    jsonschema

    pytestCheckHook

    unittestCheckHook

  ];



  pythonImportsCheck = [

    "cvss"

  ];



  disabledTests = [

    # Tests require additional data

    "test_calculator"

    "test_cvsslib"

    "test_json_ordering"

    "test_json_schema_repr"

    "test_random"

    "test_rh_vector"

    "test_simple"

    "test_simple_31"

  ];

  preCheck = ''

    cd tests

  '';



  meta = with lib; {

    description = "Library for CVSS2/3";

    description = "Library for CVSS2/3/4";

    homepage = "https://github.com/RedHatProductSecurity/cvss";

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

    license = with licenses; [ lgpl3Plus ];

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

+11 −5
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
, pytest

, pytestCheckHook

, pythonOlder

, pythonRelaxDepsHook

, pyyaml

, reptor

, requests
@@ -22,16 +23,17 @@ 
, setuptools

, sqlparse

, termcolor

, toml

, tomli

, tomli-w

, tomlkit

, urllib3

, xmltodict

}:



buildPythonPackage rec {

  pname = "reptor";

  version = "0.7";

  format = "pyproject";

  version = "0.8";

  pyproject = true;



  disabled = pythonOlder "3.8";
@@ -39,10 +41,13 @@ buildPythonPackage rec { 
    owner = "Syslifters";

    repo = "reptor";

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

    hash = "sha256-d76Hsf+leJKYOh7k/RVuo6adfjMW6yAYt+vh7KNh7sA=";

    hash = "sha256-YnDAjbj3TTr+WajuW6Dq3f+fjeJxrWk7VNWKhh9O7Zw=";

  };



  pythonRelaxDeps = true;



  nativeBuildInputs = [

    pythonRelaxDepsHook

    setuptools

  ];
@@ -61,7 +66,8 @@ buildPythonPackage rec { 
    rich

    sqlparse

    termcolor

    toml

    tomli

    tomlkit

    tomli-w

    urllib3

    xmltodict