diff --git a/src/somef/parser/bower_parser.py b/src/somef/parser/bower_parser.py index 393c153e..85d6f0e3 100644 --- a/src/somef/parser/bower_parser.py +++ b/src/somef/parser/bower_parser.py @@ -139,7 +139,7 @@ def parse_bower_json_file(file_path, metadata_result: Result, source): "name": name, "version": version, "type": constants.SOFTWARE_APPLICATION, - "dependency_type": "runtime", + "dependency_type": constants.DEPENDENCY_TYPE_RUNTIME, "dependency_resolver": "bower" }, 1, @@ -158,7 +158,7 @@ def parse_bower_json_file(file_path, metadata_result: Result, source): "name": name, "version": version, "type": constants.SOFTWARE_APPLICATION, - "dependency_type": "runtime", + "dependency_type": constants.DEPENDENCY_TYPE_RUNTIME, "dependency_resolver": "bower" }, 1, diff --git a/src/somef/parser/cabal_parser.py b/src/somef/parser/cabal_parser.py index a5d41867..5941a594 100644 --- a/src/somef/parser/cabal_parser.py +++ b/src/somef/parser/cabal_parser.py @@ -208,7 +208,7 @@ def parse_cabal_file(file_path, metadata_result: Result, source): "name": name, "version": version_constraint, "type": constants.SOFTWARE_APPLICATION, - "dependency_type": "runtime", + "dependency_type": constants.DEPENDENCY_TYPE_RUNTIME, "dependency_resolver": "cabal" }, 1, diff --git a/src/somef/parser/composer_parser.py b/src/somef/parser/composer_parser.py index 10e79bc4..9908abce 100644 --- a/src/somef/parser/composer_parser.py +++ b/src/somef/parser/composer_parser.py @@ -159,9 +159,9 @@ def parse_composer_json(file_path, metadata_result: Result, source): for name, version in data[section].items(): req = f"{name}: {version}" if section == "require-dev": - dep_type = "dev" + dep_type = constants.DEPENDENCY_TYPE_DEVELOPMENT else: - dep_type = "runtime" + dep_type = constants.DEPENDENCY_TYPE_RUNTIME metadata_result.add_result( constants.CAT_REQUIREMENTS, diff --git a/src/somef/parser/conda_environment_parser.py b/src/somef/parser/conda_environment_parser.py index ddcbf95d..b1c25e38 100644 --- a/src/somef/parser/conda_environment_parser.py +++ b/src/somef/parser/conda_environment_parser.py @@ -50,7 +50,7 @@ def parse_conda_environment_file(file_path, metadata_result: Result, source): constants.PROP_VALUE: dep, constants.PROP_NAME: re.split(r"[=<>!]", dep)[0], constants.PROP_TYPE: constants.SOFTWARE_APPLICATION, - constants.PROP_DEPENDENCY_TYPE: "runtime", + constants.PROP_DEPENDENCY_TYPE: constants.DEPENDENCY_TYPE_RUNTIME, constants.PROP_DEPENDENCY_RESOLVER: "conda" } @@ -72,7 +72,7 @@ def parse_conda_environment_file(file_path, metadata_result: Result, source): constants.PROP_VALUE: dep, constants.PROP_NAME: re.split(r"[=<>!~]", dep)[0], constants.PROP_TYPE: constants.SOFTWARE_APPLICATION, - constants.PROP_DEPENDENCY_TYPE: "runtime", + constants.PROP_DEPENDENCY_TYPE: constants.DEPENDENCY_TYPE_RUNTIME, constants.PROP_DEPENDENCY_RESOLVER: "pip" } diff --git a/src/somef/parser/gemspec_parser.py b/src/somef/parser/gemspec_parser.py index 57165eae..fa213bbc 100644 --- a/src/somef/parser/gemspec_parser.py +++ b/src/somef/parser/gemspec_parser.py @@ -189,7 +189,7 @@ def parse_gemspec_file(file_path, metadata_result: Result, source): "name": name, "version": version, "type": constants.SOFTWARE_APPLICATION, - "dependency_type": "runtime", + "dependency_type": constants.DEPENDENCY_TYPE_RUNTIME, "dependency_resolver": "bundler" }, 1, @@ -210,7 +210,7 @@ def parse_gemspec_file(file_path, metadata_result: Result, source): "name": name, "version": version, "type": constants.SOFTWARE_APPLICATION, - "dependency_type": "dev", + "dependency_type": constants.DEPENDENCY_TYPE_DEVELOPMENT, "dependency_resolver": "bundler" }, 1, diff --git a/src/somef/parser/package_json_parser.py b/src/somef/parser/package_json_parser.py index e33fd912..d13ea1b1 100644 --- a/src/somef/parser/package_json_parser.py +++ b/src/somef/parser/package_json_parser.py @@ -166,8 +166,8 @@ def parse_package_json_file(file_path, metadata_result: Result, source): # for name, version in deps.items(): sections = { - "dependencies": "runtime", - "devDependencies": "dev" + "dependencies": constants.DEPENDENCY_TYPE_RUNTIME, + "devDependencies": constants.DEPENDENCY_TYPE_DEVELOPMENT } for section, dep_type in sections.items(): diff --git a/src/somef/parser/pom_xml_parser.py b/src/somef/parser/pom_xml_parser.py index 85c94050..68fd2603 100644 --- a/src/somef/parser/pom_xml_parser.py +++ b/src/somef/parser/pom_xml_parser.py @@ -162,11 +162,11 @@ def parse_pom_file(file_path, metadata_result: Result, source): scope = dependency.get("scope", None) if scope == "test": - dep_type = "dev" + dep_type = constants.DEPENDENCY_TYPE_DEVELOPMENT elif scope == "import": continue else: - dep_type = "runtime" + dep_type = constants.DEPENDENCY_TYPE_RUNTIME metadata_result.add_result( constants.CAT_REQUIREMENTS, diff --git a/src/somef/parser/publiccode_parser.py b/src/somef/parser/publiccode_parser.py index a56492bc..dc028cf4 100644 --- a/src/somef/parser/publiccode_parser.py +++ b/src/somef/parser/publiccode_parser.py @@ -232,7 +232,7 @@ def parse_publiccode_file(file_path, metadata_result: Result, source): "name": name, "version": version, "type": constants.SOFTWARE_APPLICATION, - "dependency_type": "runtime", + "dependency_type": constants.DEPENDENCY_TYPE_RUNTIME, "dependency_resolver": "publiccode" }, 1, diff --git a/src/somef/parser/python_parser.py b/src/somef/parser/python_parser.py index d67240f2..7c062da8 100644 --- a/src/somef/parser/python_parser.py +++ b/src/somef/parser/python_parser.py @@ -121,7 +121,7 @@ def parse_requirements_txt(file_path, metadata_result: Result, source): "version": runtime["version"], "name": runtime["name"], "type": constants.STRING, - "dependency_type": "runtime", + "dependency_type": constants.DEPENDENCY_TYPE_RUNTIME, "dependency_resolver": "pip" }, 1, diff --git a/src/somef/parser/toml_parser.py b/src/somef/parser/toml_parser.py index cd9cc5d8..04f3e5ec 100644 --- a/src/somef/parser/toml_parser.py +++ b/src/somef/parser/toml_parser.py @@ -406,7 +406,7 @@ def parse_pyproject_metadata(data, metadata_result, source, file_path): "name": name, "version": version, "type": constants.SOFTWARE_APPLICATION, - "dependency_type": "runtime", + "dependency_type":constants.DEPENDENCY_TYPE_RUNTIME, "dependency_resolver": "python" }, 1, @@ -423,7 +423,7 @@ def parse_pyproject_metadata(data, metadata_result, source, file_path): "name": name, "version": version, "type": constants.SOFTWARE_APPLICATION, - "dependency_type": "runtime", + "dependency_type": constants.DEPENDENCY_TYPE_RUNTIME, "dependency_resolver": "python" }, 1, @@ -445,7 +445,7 @@ def parse_pyproject_metadata(data, metadata_result, source, file_path): "name": name, "version": version, "type": constants.SOFTWARE_APPLICATION, - "dependency_type": "runtime", + "dependency_type": constants.DEPENDENCY_TYPE_RUNTIME, "dependency_resolver": "python" }, 1, @@ -574,7 +574,7 @@ def parse_julia_project_metadata(data, metadata_result, source): "value": req, "name": req, "type": constants.SOFTWARE_APPLICATION, - "dependency_type": "runtime", + "dependency_type": constants.DEPENDENCY_TYPE_RUNTIME, "dependency_resolver": "julia" }, 1, @@ -582,7 +582,7 @@ def parse_julia_project_metadata(data, metadata_result, source): source ) - # devs requiriments + # devs requirements dev_deps = set() if "extras" in data: @@ -599,7 +599,7 @@ def parse_julia_project_metadata(data, metadata_result, source): "value": req, "name": req, "type": constants.SOFTWARE_APPLICATION, - "dependency_type": "dev", + "dependency_type": constants.DEPENDENCY_TYPE_DEVELOPMENT, "dependency_resolver": "julia" }, 1, diff --git a/src/somef/test/test_bower_parser.py b/src/somef/test/test_bower_parser.py index fac58012..d3d36235 100644 --- a/src/somef/test/test_bower_parser.py +++ b/src/somef/test/test_bower_parser.py @@ -63,7 +63,7 @@ def test_parse_bower_json(self): found_bootstrap = False for req_result in requirements_results: dependency = req_result["result"] - if dependency.get("name") == "jquery" and dependency.get("dependency_type") == "runtime": + if dependency.get("name") == "jquery" and dependency.get("dependency_type") == constants.DEPENDENCY_TYPE_RUNTIME: found_jquery = True self.assertEqual(dependency.get("dependency_resolver"),"bower","jQuery should come from the bower resolver") diff --git a/src/somef/test/test_cabal_parser.py b/src/somef/test/test_cabal_parser.py index fc50e079..1a23e4d9 100644 --- a/src/somef/test/test_cabal_parser.py +++ b/src/somef/test/test_cabal_parser.py @@ -49,7 +49,7 @@ def test_parse_cabal(self): found_dep = False for req_result in requirements_results: dependency = req_result["result"] - if dependency.get("name") == "terminal-progress-bar" and dependency.get("dependency_type") == "runtime": + if dependency.get("name") == "terminal-progress-bar" and dependency.get("dependency_type") == constants.DEPENDENCY_TYPE_RUNTIME: found_dep = True self.assertTrue(found_dep, "Dependency not found") diff --git a/src/somef/test/test_composer_parser.py b/src/somef/test/test_composer_parser.py index 652bfac4..88d8b5cf 100644 --- a/src/somef/test/test_composer_parser.py +++ b/src/somef/test/test_composer_parser.py @@ -52,8 +52,8 @@ def test_parse_composer_json_2(self): self.assertIn(constants.CAT_REQUIREMENTS, metadata_result.results) dependencies = result.results[constants.CAT_REQUIREMENTS] self.assertEqual(dependencies[0]["result"]["name"], "php") - self.assertEqual(dependencies[0]["result"]["dependency_type"], "runtime") - self.assertEqual(dependencies[1]["result"]["dependency_type"], "dev") + self.assertEqual(dependencies[0]["result"]["dependency_type"], constants.DEPENDENCY_TYPE_RUNTIME) + self.assertEqual(dependencies[1]["result"]["dependency_type"], constants.DEPENDENCY_TYPE_DEVELOPMENT) if __name__ == "__main__": unittest.main() \ No newline at end of file diff --git a/src/somef/test/test_conda_environment_parser.py b/src/somef/test/test_conda_environment_parser.py index 82ca687c..1d818890 100644 --- a/src/somef/test/test_conda_environment_parser.py +++ b/src/somef/test/test_conda_environment_parser.py @@ -40,7 +40,7 @@ def test_issue_489(self): if r["result"].get("name") == "python" ] assert python_reqs, "Expected python dependency not found" - assert python_reqs[0]["result"]["dependency_type"] == "runtime" + assert python_reqs[0]["result"]["dependency_type"] == constants.DEPENDENCY_TYPE_RUNTIME assert python_reqs[0]["result"]["dependency_resolver"] == "conda" assert python_reqs[0]["result"]["version"] == "3.8.5" @@ -49,7 +49,7 @@ def test_issue_489(self): if r["result"].get("name") == "albumentations" ] assert albumentations_reqs, "Expected albumentations dependency not found" - assert albumentations_reqs[0]["result"]["dependency_type"] == "runtime" + assert albumentations_reqs[0]["result"]["dependency_type"] == constants.DEPENDENCY_TYPE_RUNTIME assert albumentations_reqs[0]["result"]["dependency_resolver"] == "pip" assert albumentations_reqs[0]["result"]["version"] == "0.4.3" diff --git a/src/somef/test/test_gemspec_parser.py b/src/somef/test/test_gemspec_parser.py index 9b0e736f..c019f5f5 100644 --- a/src/somef/test/test_gemspec_parser.py +++ b/src/somef/test/test_gemspec_parser.py @@ -54,7 +54,7 @@ def test_parse_gemspec(self): found_bootstrap = False for req_result in requirements_results: dependency = req_result["result"] - if dependency.get("name") == "railties" and dependency.get("dependency_type") == "runtime": + if dependency.get("name") == "railties" and dependency.get("dependency_type") == constants.DEPENDENCY_TYPE_RUNTIME: found_jquery = True self.assertTrue(found_jquery, "Dependency not found") diff --git a/src/somef/utils/constants.py b/src/somef/utils/constants.py index f01f483a..258f4f2f 100644 --- a/src/somef/utils/constants.py +++ b/src/somef/utils/constants.py @@ -519,4 +519,7 @@ class RepositoryType(Enum): "reference model", "reference design", "node references", -] \ No newline at end of file +] + +DEPENDENCY_TYPE_RUNTIME = "runtime" +DEPENDENCY_TYPE_DEVELOPMENT = "development"