From 3194ed790e4f6623d34f02c5d27d25fe0fa51448 Mon Sep 17 00:00:00 2001 From: kiblik <5609770+kiblik@users.noreply.github.com> Date: Sat, 4 Jan 2025 12:32:21 +0100 Subject: [PATCH] Ruff: Fix PTH100, merge PTH10 --- dojo/management/commands/import_surveys.py | 3 +-- dojo/settings/settings.dist.py | 2 +- ruff.toml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dojo/management/commands/import_surveys.py b/dojo/management/commands/import_surveys.py index 6fcdd53bde7..d1577648806 100644 --- a/dojo/management/commands/import_surveys.py +++ b/dojo/management/commands/import_surveys.py @@ -1,4 +1,3 @@ -import os from pathlib import Path from django.core.management.base import BaseCommand @@ -28,7 +27,7 @@ def handle(self, *args, **options): row = cursor.fetchone() ctype_id = row[0] # Find the current id in the surveys file - path = Path(os.path.abspath(__file__)).parent + path = Path(__file__).parent.absolute() path = path[:-19] + "fixtures/initial_surveys.json" contents = open(path, encoding="utf-8").readlines() for line in contents: diff --git a/dojo/settings/settings.dist.py b/dojo/settings/settings.dist.py index 4f72fa171ce..ccc7cc5752e 100644 --- a/dojo/settings/settings.dist.py +++ b/dojo/settings/settings.dist.py @@ -935,7 +935,7 @@ def saml2_attrib_map_format(dict): SAML_ATTRIBUTE_MAPPING = saml2_attrib_map_format(env("DD_SAML2_ATTRIBUTES_MAP")) SAML_FORCE_AUTH = env("DD_SAML2_FORCE_AUTH") SAML_ALLOW_UNKNOWN_ATTRIBUTES = env("DD_SAML2_ALLOW_UNKNOWN_ATTRIBUTE") - BASEDIR = Path(path.abspath(__file__)).parent + BASEDIR = Path(__file__).parent.absolute() if len(env("DD_SAML2_ENTITY_ID")) == 0: SAML2_ENTITY_ID = f"{SITE_URL}/saml2/metadata/" else: diff --git a/ruff.toml b/ruff.toml index 12b556d5cf3..a4a2daa69ff 100644 --- a/ruff.toml +++ b/ruff.toml @@ -66,7 +66,7 @@ select = [ "TCH", "INT", "ARG003", "ARG004", "ARG005", - "PTH2", "PTH101", "PTH102", "PTH103", "PTH104", "PTH105", "PTH106", "PTH107", "PTH108", "PTH109", "PTH110", "PTH111", "PTH112", "PTH113", "PTH114", "PTH115", "PTH116", "PTH117", "PTH119", "PTH120", "PTH121", "PTH122", "PTH124", + "PTH2", "PTH10", "PTH110", "PTH111", "PTH112", "PTH113", "PTH114", "PTH115", "PTH116", "PTH117", "PTH119", "PTH120", "PTH121", "PTH122", "PTH124", "TD001", "TD004", "TD005", "PD", "PGH",