diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 675b9680..fb7966cb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -70,7 +70,7 @@ repos: additional_dependencies: - tomli - repo: "https://github.com/fsfe/reuse-tool" - rev: v0.14.0 + rev: v5.0.2 hooks: - id: reuse additional_dependencies: diff --git a/.reuse/dep5 b/.reuse/dep5 deleted file mode 100644 index f569949c..00000000 --- a/.reuse/dep5 +++ /dev/null @@ -1,28 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: decisionengine_modules -Upstream-Contact: HEPCloud team <> -Source: https://github.com/HEPCloud/decisionengine_modules - -# Sample paragraph, commented out: -# -# Files: src/* -# Copyright: $YEAR $NAME <$CONTACT> -# License: ... -# SPDX-FileCopyrightText: 2017 Fermi Research Alliance, LLC -# SPDX-License-Identifier: Apache-2.0 - -Files: src/*.jsonnet src/*/readme src/*.conf src/*.fixture src/*.csv src/*/AWS/scratch src/*/gce_limits_factory_entries.test src/*/data/monitoring.json src/*/data/passwd src/*/data/expected_metric_values.json -Copyright: 2017 Fermi Research Alliance, LLC -License: Apache-2.0 - -Files: .codecov.yml .codespell/ignore_lines.txt .codespell/ignore_words.txt .coveragerc .editorconfig .gitignore .lgtm.yaml .pep8speaks.yml .pre-commit-config.yaml .pylintrc _config.yml pyproject.toml uv.lock -Copyright: 2017 Fermi Research Alliance, LLC -License: Apache-2.0 - -Files: package/rpm/* package/systemd/* -Copyright: 2017 Fermi Research Alliance, LLC -License: Apache-2.0 - -Files: dashboards/*.json -Copyright: 2017 Fermi Research Alliance, LLC -License: Apache-2.0 diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 00000000..4821a71d --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,54 @@ +version = 1 +SPDX-PackageName = "decisionengine_modules" +SPDX-PackageSupplier = "HEPCloud team <>" +SPDX-PackageDownloadLocation = "https://github.com/HEPCloud/decisionengine_modules" + +[[annotations]] +path = [ + "src/**.jsonnet", + "src/**/readme", + "src/**.conf", + "src/**.fixture", + "src/**.fixture.json", + "src/**.csv", + "src/**/AWS/scratch", + "src/**/gce_limits_factory_entries.test", + "src/**/data/monitoring.json", + "src/**/data/passwd", + "src/**/data/expected_metric_values.json" +] +precedence = "aggregate" +SPDX-FileCopyrightText = "2017 Fermi Research Alliance, LLC" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = [ + ".codecov.yml", + ".codespell/ignore_lines.txt", + ".codespell/ignore_words.txt", + ".coveragerc", + ".editorconfig", + ".gitignore", + ".lgtm.yaml", + ".pep8speaks.yml", + ".pre-commit-config.yaml", + ".pylintrc", + "_config.yml", + "pyproject.toml", + "uv.lock" +] +precedence = "aggregate" +SPDX-FileCopyrightText = "2017 Fermi Research Alliance, LLC" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = ["package/rpm/**", "package/systemd/**"] +precedence = "aggregate" +SPDX-FileCopyrightText = "2017 Fermi Research Alliance, LLC" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "dashboards/**.json" +precedence = "aggregate" +SPDX-FileCopyrightText = "2017 Fermi Research Alliance, LLC" +SPDX-License-Identifier = "Apache-2.0" diff --git a/pyproject.toml b/pyproject.toml index da497947..fd513c96 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,52 +6,48 @@ build-backend = "setuptools.build_meta" name = "hepcloud-de-modules" dynamic = ["version"] readme = "README.md" -license = {text ="Apache-2.0"} +license = { text = "Apache-2.0" } requires-python = ">=3.9, <3.13" -authors = [ - { name = "Fermilab" }, -] +authors = [{ name = "Fermilab" }] dependencies = [ - "authlib", - "bill-calculator-hep >= 0.2.3", - "boto3 >= 1.17.10", - "cryptography", - #"hepcloud-de >= 2.0", - "gcs-oauth2-boto-plugin >= 2.7", - "google-api-python-client >= 1.12.8", - "google_auth >= 1.16.0", - "htcondor >= 9.0.0", - "numpy >= 1.19.5, < 2.0.0; python_version >= '3.7'", - "pandas >= 1.5.3, < 2.0.0; python_version >= '3.7'", - "pem", - "PyJWT", - "qcs-api-client >= 0.21.1; python_version >= '3.7'", - "requests >= 2.14.2", - "structlog >= 21.1.0", - "urllib3 >= 1.26.2", + "authlib", + "bill-calculator-hep >= 0.2.3", + "boto3 >= 1.17.10", + "cryptography", + #"hepcloud-de >= 2.0", + "gcs-oauth2-boto-plugin >= 2.7", + "google-api-python-client >= 1.12.8", + "google_auth >= 1.16.0", + "htcondor >= 9.0.0", + "numpy >= 1.19.5, < 2.0.0; python_version >= '3.7'", + "pandas >= 1.5.3, < 2.0.0; python_version >= '3.7'", + "pem", + "PyJWT", + "qcs-api-client >= 0.21.1; python_version >= '3.7'", + "requests >= 2.14.2", + "structlog >= 21.1.0", + "urllib3 >= 1.26.2", ] [project.optional-dependencies] develop = [ - "coverage >= 6.1.2", - "flake8 >= 6.0.0, < 7.0.0", - "importlib_resources >= 5.1.2; python_version <= '3.8'", - "packaging >= 20.9", - "pylint >= 2.7.4", - "pytest >= 7.0.0, < 8.0", - "pytest-cov >= 2.11.1", - "pytest-xdist[psutil] >= 2.3.0", - "pyyaml >= 5.4.1", - "reuse >= 1.1.2", - "sphinx >= 3.5.3", - "sphinx_rtd_theme >= 0.5.1", - "tabulate >= 0.8.8", - "toml >= 0.10.2", - "wheel >= 0.36.2", -] -production = [ - "hepcloud-de >= 2.0.0", + "coverage >= 6.1.2", + "flake8 >= 6.0.0, < 7.0.0", + "importlib_resources >= 5.1.2; python_version <= '3.8'", + "packaging >= 20.9", + "pylint >= 2.7.4", + "pytest >= 7.0.0, < 8.0", + "pytest-cov >= 2.11.1", + "pytest-xdist[psutil] >= 2.3.0", + "pyyaml >= 5.4.1", + "reuse >= 1.1.2", + "sphinx >= 3.5.3", + "sphinx_rtd_theme >= 0.5.1", + "tabulate >= 0.8.8", + "toml >= 0.10.2", + "wheel >= 0.36.2", ] +production = ["hepcloud-de >= 2.0.0"] [project.urls] # https://packaging.python.org/en/latest/specifications/well-known-project-urls/#well-known-project-urls @@ -100,7 +96,4 @@ lines_between_types = 1 force_alphabetical_sort_within_sections = "True" [tool.uv] -environments = [ - "sys_platform == 'darwin'", - "sys_platform == 'linux'", -] +environments = ["sys_platform == 'darwin'", "sys_platform == 'linux'"] diff --git a/src/decisionengine_modules/glideinwms/transforms/glidein_requests.py b/src/decisionengine_modules/glideinwms/transforms/glidein_requests.py index 82be73f4..ca063064 100644 --- a/src/decisionengine_modules/glideinwms/transforms/glidein_requests.py +++ b/src/decisionengine_modules/glideinwms/transforms/glidein_requests.py @@ -20,11 +20,15 @@ "startd_manifests", "Grid_Figure_Of_Merit", "GCE_Figure_Of_Merit", - "AWS_Figure_Of_Merit", + # "AWS_Figure_Of_Merit", "Nersc_Figure_Of_Merit", ] -_SUPPORTED_ENTRY_TYPES = ["LCF", "AWS", "Grid", "GCE"] +_SUPPORTED_ENTRY_TYPES = [ + "LCF", + "Grid", + "GCE", +] # ["LCF", "AWS", "Grid", "GCE"] AWS Code has been commented to ease future re-insertion METRICS = { "NUMBER_OF_JOBS": Gauge("de_jobs_total", "Number of jobs seen by the Decision Engine"), @@ -111,7 +115,7 @@ def transform(self, datablock): foms = { "Grid_Figure_Of_Merit": self.Grid_Figure_Of_Merit(datablock), "GCE_Figure_Of_Merit": self.GCE_Figure_Of_Merit(datablock), - "AWS_Figure_Of_Merit": self.AWS_Figure_Of_Merit(datablock), + # "AWS_Figure_Of_Merit": self.AWS_Figure_Of_Merit(datablock), "Nersc_Figure_Of_Merit": self.Nersc_Figure_Of_Merit(datablock), } fom_entries = fom_eligible_resources(