From b6ffcd6b173bfe7acbe5de356b0f2814a60e711e Mon Sep 17 00:00:00 2001 From: Daniel Salazar Date: Tue, 9 Jan 2024 16:00:33 -0500 Subject: [PATCH] feat(back): #1171 use new builtin - Migrate calculateCvss3 - Migrate lintWithLizard Signed-off-by: Daniel Salazar --- src/args/calculate-cvss-3/default.nix | 8 ++++---- src/args/calculate-cvss-3/poetry.lock | 17 +++++++++++++++++ src/args/calculate-cvss-3/pyproject.toml | 15 +++++++++++++++ src/args/lint-with-lizard/default.nix | 8 ++++---- src/args/lint-with-lizard/poetry.lock | 17 +++++++++++++++++ src/args/lint-with-lizard/pyproject.toml | 15 +++++++++++++++ 6 files changed, 72 insertions(+), 8 deletions(-) create mode 100644 src/args/calculate-cvss-3/poetry.lock create mode 100644 src/args/calculate-cvss-3/pyproject.toml create mode 100644 src/args/lint-with-lizard/poetry.lock create mode 100644 src/args/lint-with-lizard/pyproject.toml diff --git a/src/args/calculate-cvss-3/default.nix b/src/args/calculate-cvss-3/default.nix index 95907393..939e1a01 100644 --- a/src/args/calculate-cvss-3/default.nix +++ b/src/args/calculate-cvss-3/default.nix @@ -1,7 +1,7 @@ { __nixpkgs__, makeDerivation, - makePythonPypiEnvironment, + makePythonEnvironment, ... }: envTarget: makeDerivation { @@ -12,9 +12,9 @@ makeDerivation { name = "calculate-cvss-3"; searchPaths = { source = [ - (makePythonPypiEnvironment { - name = "cvss"; - sourcesYaml = ./sources.yaml; + (makePythonEnvironment { + pythonProjectDir = ./.; + pythonVersion = "3.11"; }) ]; }; diff --git a/src/args/calculate-cvss-3/poetry.lock b/src/args/calculate-cvss-3/poetry.lock new file mode 100644 index 00000000..72cb5fd9 --- /dev/null +++ b/src/args/calculate-cvss-3/poetry.lock @@ -0,0 +1,17 @@ +# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. + +[[package]] +name = "cvss" +version = "2.3" +description = "CVSS2/3 library with interactive calculator for Python 2 and Python 3" +optional = false +python-versions = "*" +files = [ + {file = "cvss-2.3-py2.py3-none-any.whl", hash = "sha256:0b6b6b78e140f5abbaf75a48d77e970afe6da17763f568a2dca32b23e986a336"}, + {file = "cvss-2.3.tar.gz", hash = "sha256:fc22c9da2e7b93e0476cbea1279c95e7be08a3413e2d946686f0271501a24140"}, +] + +[metadata] +lock-version = "2.0" +python-versions = "^3.11" +content-hash = "2af356ad93cd66ac9fdbf6bf4c7a6a8134e175302a2613fa8dc5acfbb2120d41" diff --git a/src/args/calculate-cvss-3/pyproject.toml b/src/args/calculate-cvss-3/pyproject.toml new file mode 100644 index 00000000..c56a4cbb --- /dev/null +++ b/src/args/calculate-cvss-3/pyproject.toml @@ -0,0 +1,15 @@ +[tool.poetry] +name = "calculate-cvss-3" +version = "0.1.0" +description = "" +authors = ["Your Name "] +readme = "README.md" + +[tool.poetry.dependencies] +python = "^3.11" +cvss = "2.3" + + +[build-system] +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/src/args/lint-with-lizard/default.nix b/src/args/lint-with-lizard/default.nix index b5aef19b..e0012793 100644 --- a/src/args/lint-with-lizard/default.nix +++ b/src/args/lint-with-lizard/default.nix @@ -1,7 +1,7 @@ { makeDerivation, makeDerivationParallel, - makePythonPypiEnvironment, + makePythonEnvironment, ... }: { targets, @@ -16,9 +16,9 @@ name = "build-lint-with-lizard-for-${name}-${envTarget}"; searchPaths = { source = [ - (makePythonPypiEnvironment { - name = "lizard"; - sourcesYaml = ./sources.yaml; + (makePythonEnvironment { + pythonProjectDir = ./.; + pythonVersion = "3.11"; }) ]; }; diff --git a/src/args/lint-with-lizard/poetry.lock b/src/args/lint-with-lizard/poetry.lock new file mode 100644 index 00000000..33a5fb38 --- /dev/null +++ b/src/args/lint-with-lizard/poetry.lock @@ -0,0 +1,17 @@ +# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. + +[[package]] +name = "lizard" +version = "1.17.3" +description = "A code analyzer without caring the C/C++ header files. It works with Java, C/C++, JavaScript, Python, Ruby, Swift, Objective C. Metrics includes cyclomatic complexity number etc." +optional = false +python-versions = "*" +files = [ + {file = "lizard-1.17.3-py2.py3-none-any.whl", hash = "sha256:d7295be98d43d79cf4bb8daf0cdcdc2d32a238a3e4981a4adf9a628a8a3a1f9d"}, + {file = "lizard-1.17.3.tar.gz", hash = "sha256:21994effc04979e80973ae603f02ada19405a773e3aa55795fa952fbb6c0e894"}, +] + +[metadata] +lock-version = "2.0" +python-versions = "^3.11" +content-hash = "af97cbcfdabf4ef6a796bf0a6fa739f25df05f94b8bf2ff618b89087f700f726" diff --git a/src/args/lint-with-lizard/pyproject.toml b/src/args/lint-with-lizard/pyproject.toml new file mode 100644 index 00000000..4473cce9 --- /dev/null +++ b/src/args/lint-with-lizard/pyproject.toml @@ -0,0 +1,15 @@ +[tool.poetry] +name = "lint-with-lizard" +version = "0.1.0" +description = "" +authors = ["Your Name "] +readme = "README.md" + +[tool.poetry.dependencies] +python = "^3.11" +lizard = "1.17.3" + + +[build-system] +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api"