Merge branch 'develop' into add_nightly_supply_chain_review

Author: ajnelson-nist

.github/workflows/cicd.yml

@@ -39,7 +39,7 @@ jobs:
       matrix:
         python-version:
           - '3.9'
-          - '3.12'
+          - '3.13'
 
     steps:
     - uses: actions/checkout@v4

.github/workflows/prerelease.yml

@@ -30,7 +30,7 @@ jobs:
       matrix:
         python-version:
           - '3.9'
-          - '3.12'
+          - '3.13'
 
     steps:
     - uses: actions/checkout@v4

.pre-commit-config.yaml

@@ -1,14 +1,14 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 24.10.0
+    rev: 25.1.0
     hooks:
       - id: black
   - repo: https://github.com/pycqa/flake8
-    rev: 7.1.1
+    rev: 7.2.0
     hooks:
       - id: flake8
   - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
+    rev: 6.0.1
     hooks:
       - id: isort
         name: isort (python)

case_utils/__init__.py

@@ -14,4 +14,4 @@
 #
 # We would appreciate acknowledgement if the software is used.
 
-__version__ = "0.16.0"
+__version__ = "0.17.0"

case_utils/case_file/__init__.py

@@ -18,7 +18,7 @@
 This module creates a graph object that provides a basic UCO characterization of a single file.  The gathered metadata is among the more "durable" file characteristics, i.e. characteristics that would remain consistent when transferring a file between locations.
 """
 
-__version__ = "0.6.0"
+__version__ = "0.7.0"
 
 import argparse
 import datetime
@@ -38,7 +38,6 @@
     NS_UCO_CORE,
     NS_UCO_OBSERVABLE,
     NS_UCO_TYPES,
-    NS_UCO_VOCABULARY,
     NS_XSD,
 )
 
@@ -228,14 +227,9 @@ def create_file_node(
 
             l_hash_method: rdflib.Literal
             if key in ("sha3_256", "sha3_512"):
-                l_hash_method = rdflib.Literal(
-                    key.replace("_", "-").upper(),
-                    datatype=NS_UCO_VOCABULARY.HashNameVocab,
-                )
+                l_hash_method = rdflib.Literal(key.replace("_", "-").upper())
             else:
-                l_hash_method = rdflib.Literal(
-                    key.upper(), datatype=NS_UCO_VOCABULARY.HashNameVocab
-                )
+                l_hash_method = rdflib.Literal(key.upper())
 
             hash_value: str = getattr(successful_hashdict, key)
             l_hash_value = rdflib.Literal(hash_value.upper(), datatype=NS_XSD.hexBinary)
@@ -300,7 +294,6 @@ def main() -> None:
     graph.namespace_manager.bind("uco-core", NS_UCO_CORE)
     graph.namespace_manager.bind("uco-observable", NS_UCO_OBSERVABLE)
     graph.namespace_manager.bind("uco-types", NS_UCO_TYPES)
-    graph.namespace_manager.bind("uco-vocabulary", NS_UCO_VOCABULARY)
     graph.namespace_manager.bind("xsd", NS_XSD)
 
     output_format = None

case_utils/case_sparql_construct/__init__.py

@@ -18,7 +18,7 @@
 This script executes a SPARQL CONSTRUCT query, returning a graph of the generated triples.
 """
 
-__version__ = "0.2.6"
+__version__ = "0.2.7"
 
 import argparse
 import logging

case_utils/case_sparql_select/__init__.py

@@ -29,7 +29,7 @@
 Should a more complex query be necessary, an outer, wrapping SELECT query would let this script continue to function.
 """
 
-__version__ = "0.5.2"
+__version__ = "0.5.3"
 
 import argparse
 import binascii

case_utils/case_validate/__init__.py

@@ -32,7 +32,7 @@
 details.)
 """
 
-__version__ = "0.5.0"
+__version__ = "0.6.0"
 
 import argparse
 import logging

case_utils/inherent_uuid.py

@@ -57,7 +57,7 @@
 >>> assert str(n_file_facet)[-36:] == str(n_file_facet_2)[-36:]
 """
 
-__version__ = "0.1.2"
+__version__ = "0.2.0"
 
 import binascii
 import re
@@ -66,16 +66,16 @@
 
 from rdflib import Literal, Namespace, URIRef
 
-from case_utils.namespace import NS_UCO_CORE, NS_UCO_VOCABULARY, NS_XSD
+from case_utils.namespace import NS_UCO_CORE, NS_XSD
 
-L_MD5 = Literal("MD5", datatype=NS_UCO_VOCABULARY.HashNameVocab)
-L_SHA1 = Literal("SHA1", datatype=NS_UCO_VOCABULARY.HashNameVocab)
-L_SHA256 = Literal("SHA256", datatype=NS_UCO_VOCABULARY.HashNameVocab)
-L_SHA3_256 = Literal("SHA3-256", datatype=NS_UCO_VOCABULARY.HashNameVocab)
-L_SHA3_512 = Literal("SHA3-512", datatype=NS_UCO_VOCABULARY.HashNameVocab)
-L_SHA384 = Literal("SHA384", datatype=NS_UCO_VOCABULARY.HashNameVocab)
-L_SHA512 = Literal("SHA512", datatype=NS_UCO_VOCABULARY.HashNameVocab)
-L_SSDEEP = Literal("SSDEEP", datatype=NS_UCO_VOCABULARY.HashNameVocab)
+L_MD5 = Literal("MD5")
+L_SHA1 = Literal("SHA1")
+L_SHA256 = Literal("SHA256")
+L_SHA3_256 = Literal("SHA3-256")
+L_SHA3_512 = Literal("SHA3-512")
+L_SHA384 = Literal("SHA384")
+L_SHA512 = Literal("SHA512")
+L_SSDEEP = Literal("SSDEEP")
 
 # Key: hashMethod literal.
 # Value: Tuple.