Skip to content

Commit 6775123

Browse files
authored
Merge pull request #174 from casework/build_case_1.4.0
Add CASE 1.4.0 release
2 parents 908dd36 + e3a7823 commit 6775123

25 files changed

+22439
-394
lines changed

case_utils/case_file/__init__.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
NS_UCO_CORE,
3939
NS_UCO_OBSERVABLE,
4040
NS_UCO_TYPES,
41-
NS_UCO_VOCABULARY,
4241
NS_XSD,
4342
)
4443

@@ -228,14 +227,9 @@ def create_file_node(
228227

229228
l_hash_method: rdflib.Literal
230229
if key in ("sha3_256", "sha3_512"):
231-
l_hash_method = rdflib.Literal(
232-
key.replace("_", "-").upper(),
233-
datatype=NS_UCO_VOCABULARY.HashNameVocab,
234-
)
230+
l_hash_method = rdflib.Literal(key.replace("_", "-").upper())
235231
else:
236-
l_hash_method = rdflib.Literal(
237-
key.upper(), datatype=NS_UCO_VOCABULARY.HashNameVocab
238-
)
232+
l_hash_method = rdflib.Literal(key.upper())
239233

240234
hash_value: str = getattr(successful_hashdict, key)
241235
l_hash_value = rdflib.Literal(hash_value.upper(), datatype=NS_XSD.hexBinary)
@@ -300,7 +294,6 @@ def main() -> None:
300294
graph.namespace_manager.bind("uco-core", NS_UCO_CORE)
301295
graph.namespace_manager.bind("uco-observable", NS_UCO_OBSERVABLE)
302296
graph.namespace_manager.bind("uco-types", NS_UCO_TYPES)
303-
graph.namespace_manager.bind("uco-vocabulary", NS_UCO_VOCABULARY)
304297
graph.namespace_manager.bind("xsd", NS_XSD)
305298

306299
output_format = None

case_utils/inherent_uuid.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,16 @@
6666

6767
from rdflib import Literal, Namespace, URIRef
6868

69-
from case_utils.namespace import NS_UCO_CORE, NS_UCO_VOCABULARY, NS_XSD
70-
71-
L_MD5 = Literal("MD5", datatype=NS_UCO_VOCABULARY.HashNameVocab)
72-
L_SHA1 = Literal("SHA1", datatype=NS_UCO_VOCABULARY.HashNameVocab)
73-
L_SHA256 = Literal("SHA256", datatype=NS_UCO_VOCABULARY.HashNameVocab)
74-
L_SHA3_256 = Literal("SHA3-256", datatype=NS_UCO_VOCABULARY.HashNameVocab)
75-
L_SHA3_512 = Literal("SHA3-512", datatype=NS_UCO_VOCABULARY.HashNameVocab)
76-
L_SHA384 = Literal("SHA384", datatype=NS_UCO_VOCABULARY.HashNameVocab)
77-
L_SHA512 = Literal("SHA512", datatype=NS_UCO_VOCABULARY.HashNameVocab)
78-
L_SSDEEP = Literal("SSDEEP", datatype=NS_UCO_VOCABULARY.HashNameVocab)
69+
from case_utils.namespace import NS_UCO_CORE, NS_XSD
70+
71+
L_MD5 = Literal("MD5")
72+
L_SHA1 = Literal("SHA1")
73+
L_SHA256 = Literal("SHA256")
74+
L_SHA3_256 = Literal("SHA3-256")
75+
L_SHA3_512 = Literal("SHA3-512")
76+
L_SHA384 = Literal("SHA384")
77+
L_SHA512 = Literal("SHA512")
78+
L_SSDEEP = Literal("SSDEEP")
7979

8080
# Key: hashMethod literal.
8181
# Value: Tuple.

0 commit comments

Comments
 (0)