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

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

python312Packages.cyclonedx-python-lib: 6.4.4 -> 7.3.2
parents 901ff63f a96f5b34
Loading
Loading
Loading
Loading
+31 −37
Original line number Diff line number Diff line
{ lib
, buildPythonPackage
, ddt
, fetchFromGitHub
, importlib-metadata
, jsonschema
, license-expression
, lxml
, packageurl-python
, py-serializable
, pythonRelaxDepsHook
, poetry-core
, pytestCheckHook
, pythonOlder
, requirements-parser
, sortedcontainers
, setuptools
, toml
, types-setuptools
, types-toml
, xmldiff
{
  lib,
  buildPythonPackage,
  ddt,
  fetchFromGitHub,
  importlib-metadata,
  jsonschema,
  license-expression,
  lxml,
  packageurl-python,
  py-serializable,
  pythonRelaxDepsHook,
  poetry-core,
  pytestCheckHook,
  pythonOlder,
  requirements-parser,
  sortedcontainers,
  setuptools,
  toml,
  types-setuptools,
  types-toml,
  xmldiff,
}:

buildPythonPackage rec {
  pname = "cyclonedx-python-lib";
  version = "6.4.4";
  version = "7.3.2";
  pyproject = true;

  disabled = pythonOlder "3.9";
@@ -32,15 +33,14 @@ buildPythonPackage rec {
    owner = "CycloneDX";
    repo = "cyclonedx-python-lib";
    rev = "refs/tags/v${version}";
    hash = "sha256-PNacp16WZHNblFyA117hSL87IKGMrW0OYNXCSoBoO8Q=";
    hash = "sha256-z+QBjMT0L7dqCJvbwok9TWQajIPzmAq3XPLWFxmhPsk=";
  };

  nativeBuildInputs = [
    poetry-core
    pythonRelaxDepsHook
  ];
  build-system = [ poetry-core ];

  nativeBuildInputs = [ pythonRelaxDepsHook ];

  propagatedBuildInputs = [
  dependencies = [
    importlib-metadata
    license-expression
    packageurl-python
@@ -61,21 +61,15 @@ buildPythonPackage rec {
    xmldiff
  ];

  pythonImportsCheck = [
    "cyclonedx"
  ];
  pythonImportsCheck = [ "cyclonedx" ];

  pythonRelaxDeps = [
    "py-serializable"
  ];
  pythonRelaxDeps = [ "py-serializable" ];

  preCheck = ''
    export PYTHONPATH=tests''${PYTHONPATH+:$PYTHONPATH}
  '';

  pytestFlagsArray = [
    "tests/"
  ];
  pytestFlagsArray = [ "tests/" ];

  disabledTests = [
    # These tests require network access
+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ python3.pkgs.buildPythonApplication rec {
    "bc-python-hcl2"
    "boto3"
    "botocore"
    "cyclonedx-python-lib"
    "dpath"
    "igraph"
    "license-expression"