diff --git a/pyproject.toml b/pyproject.toml index a08e198..8e0ccd4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "belleii_rucio_policy_package" -version = "0.0.3" +version = "0.0.4" authors = [ { name="Belle II", email="placeholder@placeholder.com" }, ] diff --git a/src/belleii_rucio_policy_package/lfn2pfn.py b/src/belleii_rucio_policy_package/lfn2pfn.py index 6c51f13..2c6e770 100644 --- a/src/belleii_rucio_policy_package/lfn2pfn.py +++ b/src/belleii_rucio_policy_package/lfn2pfn.py @@ -1,6 +1,6 @@ -from rucio.rse.translation import RSEDeterministicTranslation +import rucio.rse.translation -class BelleIIRSEDeterministicTranslation(RSEDeterministicTranslation): +class BelleIIRSEDeterministicTranslation(rucio.rse.translation.RSEDeterministicTranslation): def __init__(self, rse=None, rse_attributes=None, protocol_attributes=None): """ diff --git a/src/belleii_rucio_policy_package/non_deterministic_pfn.py b/src/belleii_rucio_policy_package/non_deterministic_pfn.py index 395e29a..b8f3c52 100644 --- a/src/belleii_rucio_policy_package/non_deterministic_pfn.py +++ b/src/belleii_rucio_policy_package/non_deterministic_pfn.py @@ -1,9 +1,9 @@ from typing import Optional -from rucio.common.utils import NonDeterministicPFNAlgorithms +import rucio.common.utils -class BelleIINonDeterministicPFNAlgorithm(NonDeterministicPFNAlgorithms): +class BelleIINonDeterministicPFNAlgorithm(rucio.common.utils.NonDeterministicPFNAlgorithms): """ Belle II specific non-deterministic PFN algorithm """ diff --git a/src/belleii_rucio_policy_package/schema.py b/src/belleii_rucio_policy_package/schema.py index 83a216f..33656d0 100644 --- a/src/belleii_rucio_policy_package/schema.py +++ b/src/belleii_rucio_policy_package/schema.py @@ -14,7 +14,7 @@ from jsonschema import ValidationError, validate -from rucio.common.exception import InvalidObject +import rucio.common.exception ACCOUNT_LENGTH = 25 @@ -405,4 +405,4 @@ def validate_schema(name, obj): if obj: validate(obj, SCHEMAS.get(name, {})) except ValidationError as error: # NOQA, pylint: disable=W0612 - raise InvalidObject(f'Problem validating {name}: {error}') + raise rucio.common.exception.InvalidObject(f'Problem validating {name}: {error}') diff --git a/src/belleii_rucio_policy_package/scope.py b/src/belleii_rucio_policy_package/scope.py index 5491c3d..8011655 100644 --- a/src/belleii_rucio_policy_package/scope.py +++ b/src/belleii_rucio_policy_package/scope.py @@ -1,10 +1,11 @@ from typing import TYPE_CHECKING, Optional -from rucio.common.utils import ScopeExtractionAlgorithms + +import rucio.common.utils if TYPE_CHECKING: from collections.abc import Sequence -class BelleIIScopeExtractionAlgorithm(ScopeExtractionAlgorithms): +class BelleIIScopeExtractionAlgorithm(rucio.common.utils.ScopeExtractionAlgorithms): def __init__(self) -> None: """ Initialises scope extraction algorithm object