diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5b603ea..a9c38d2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,15 +2,15 @@ # See https://pre-commit.com/hooks.html for more hooks repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v5.0.0 + rev: v6.0.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer - id: check-yaml - id: check-added-large-files -- repo: https://github.com/psf/black - rev: 24.10.0 +- repo: https://github.com/psf/black-pre-commit-mirror + rev: 26.1.0 hooks: - id: black args: [--safe, --line-length=100, --preview] @@ -22,14 +22,14 @@ repos: language_version: python3 - repo: https://github.com/pycqa/docformatter - rev: v1.7.6 + rev: v1.7.7 hooks: - id: docformatter additional_dependencies: [tomli] args: [--config, pyproject.toml] - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.11.2 + rev: v1.19.1 hooks: - id: mypy additional_dependencies: [ @@ -38,7 +38,7 @@ repos: ] - repo: https://github.com/pycqa/flake8 - rev: 7.1.1 + rev: 7.3.0 hooks: - id: flake8 diff --git a/outsource/config.py b/outsource/config.py index 039fa22..3d4f99c 100644 --- a/outsource/config.py +++ b/outsource/config.py @@ -15,7 +15,6 @@ SALTAX, ) - LOWER_DISK = uconfig.getint("Outsource", "lower_disk", fallback=None) LOWER_MEMORY = uconfig.getint("Outsource", "lower_memory", fallback=None) COMBINE_DISK = uconfig.getint("Outsource", "combine_disk", fallback=None) diff --git a/outsource/meta.py b/outsource/meta.py index 79595b1..883fac1 100644 --- a/outsource/meta.py +++ b/outsource/meta.py @@ -2,7 +2,6 @@ from utilix import uconfig import straxen - NO_PER_CHUNK = uconfig.getboolean("Outsource", "no_per_chunk", fallback=False) diff --git a/outsource/scripts/submit.py b/outsource/scripts/submit.py index 1c29efb..b9e6984 100644 --- a/outsource/scripts/submit.py +++ b/outsource/scripts/submit.py @@ -7,7 +7,6 @@ from outsource.utils import get_context, get_runlist, SALTAX - logger = setup_logger("outsource", uconfig.get("Outsource", "logging_level", fallback="WARNING")) coll = xent_collection() diff --git a/outsource/submitter.py b/outsource/submitter.py index 924f594..529f5c8 100644 --- a/outsource/submitter.py +++ b/outsource/submitter.py @@ -12,7 +12,6 @@ from outsource.config import RunConfig from outsource.utils import get_to_save_data_types - IMAGE_PREFIX = "/cvmfs/singularity.opensciencegrid.org/xenonnt/base-environment:" diff --git a/outsource/submitters/htcondor.py b/outsource/submitters/htcondor.py index 8336ccd..b2ad821 100644 --- a/outsource/submitters/htcondor.py +++ b/outsource/submitters/htcondor.py @@ -24,7 +24,6 @@ from outsource.meta import DETECTOR_DATA_TYPES from outsource.utils import get_resources_retry - base_dir = os.path.dirname(os.path.abspath(os.path.dirname(__file__))) diff --git a/outsource/submitters/slurm.py b/outsource/submitters/slurm.py index 49af490..f865995 100644 --- a/outsource/submitters/slurm.py +++ b/outsource/submitters/slurm.py @@ -9,7 +9,6 @@ from outsource.utils import get_context, get_chunk_number from outsource.submitter import Submitter - base_dir = os.path.dirname(os.path.abspath(os.path.dirname(__file__))) diff --git a/outsource/upload.py b/outsource/upload.py index dbbd5f4..e3eda65 100644 --- a/outsource/upload.py +++ b/outsource/upload.py @@ -7,7 +7,6 @@ from outsource.utils import get_rse - logger = setup_logger("outsource", uconfig.get("Outsource", "logging_level", fallback="WARNING")) admix.clients._init_clients() db = DB() diff --git a/outsource/utils.py b/outsource/utils.py index 35f966a..ac033b2 100644 --- a/outsource/utils.py +++ b/outsource/utils.py @@ -10,7 +10,6 @@ from outsource.meta import get_clean_detector_data_types, get_clean_per_chunk_data_types - logger = setup_logger("outsource", uconfig.get("Outsource", "logging_level", fallback="WARNING")) coll = xent_collection() diff --git a/outsource/workflow/combine.py b/outsource/workflow/combine.py index 3e1de2d..28040c1 100755 --- a/outsource/workflow/combine.py +++ b/outsource/workflow/combine.py @@ -10,7 +10,6 @@ from outsource.utils import get_context, per_chunk_storage_root_data_type, SALTAX from outsource.upload import upload_to_rucio - logger = setup_logger("outsource", uconfig.get("Outsource", "logging_level", fallback="WARNING")) admix.clients._init_clients() diff --git a/outsource/workflow/test_resource_usage.py b/outsource/workflow/test_resource_usage.py index 9a3813d..fc91a3a 100644 --- a/outsource/workflow/test_resource_usage.py +++ b/outsource/workflow/test_resource_usage.py @@ -15,7 +15,6 @@ from outsource.workflow.combine import main as combine_main from outsource.workflow.combine import merge - logger = setup_logger("outsource", uconfig.get("Outsource", "logging_level", fallback="WARNING")) parser = argparse.ArgumentParser()