about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFabian Affolter <fabian@affolter-engineering.ch>2023-08-14 09:11:03 +0200
committerGitHub <noreply@github.com>2023-08-14 09:11:03 +0200
commitf4c11b80885cbb150f98056d68c813179ca0d31b (patch)
tree309415cd14d458f3b395d65d9838d93b8bba64be
parentf2e4984fc18694c056a747ec5aef8d0ed3279e43 (diff)
parent69b99a750fe49a3049df830f578a82c1ca87d9bb (diff)
Merge pull request #248286 from tobim/pkgs/spdx-tools-0.8
python3Packages.spdx-tools: 0.7.1 -> 0.8.0
-rw-r--r--pkgs/development/python-modules/spdx-tools/default.nix17
1 files changed, 14 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/spdx-tools/default.nix b/pkgs/development/python-modules/spdx-tools/default.nix
index 72ddbef10b76d..3751864ff27d7 100644
--- a/pkgs/development/python-modules/spdx-tools/default.nix
+++ b/pkgs/development/python-modules/spdx-tools/default.nix
@@ -1,10 +1,13 @@
 { lib
 , buildPythonPackage
+, beartype
 , click
 , fetchPypi
+, license-expression
 , pyyaml
 , rdflib
 , ply
+, semantic-version
 , xmltodict
 , pytestCheckHook
 , pythonOlder
@@ -13,21 +16,24 @@
 
 buildPythonPackage rec {
   pname = "spdx-tools";
-  version = "0.7.1";
+  version = "0.8.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-l15tu6iPEFqKyyKr9T/pDw6dVjWiubH+SHeB6WliOxc=";
+    hash = "sha256-ZoCb94eDtHFH3K9ppju51WHrReay7BXC6P4VUOJK4c0=";
   };
 
   propagatedBuildInputs = [
+    beartype
     click
+    license-expression
     ply
     pyyaml
     rdflib
+    semantic-version
     uritools
     xmltodict
   ];
@@ -37,7 +43,12 @@ buildPythonPackage rec {
   ];
 
   pythonImportsCheck = [
-    "spdx"
+    "spdx_tools.spdx"
+  ];
+
+  disabledTestPaths = [
+    # Depends on the currently not packaged pyshacl module.
+    "tests/spdx3/validation/json_ld/test_shacl_validation.py"
   ];
 
   meta = with lib; {