Mark rucio as first-party dependency for isort and re-sort imports; #…

…6538

rucio is detected as a third-party dependency by default
(likely has to do with the project structure or __init__ files).
This change configures isort to treat rucio as a first-party dependency,
and re-formats the files.

bin/rucio

@@ -31,6 +31,8 @@ from copy import deepcopy
 from datetime import datetime
 from functools import wraps
 
+from tabulate import tabulate
+
 # rucio module has the same name as this executable module, so this rule fails. pylint: disable=no-name-in-module
 from rucio import version
 from rucio.client import Client
@@ -58,7 +60,6 @@ from rucio.common.exception import (
 from rucio.common.extra import import_extras
 from rucio.common.test_rucio_server import TestRucioServer
 from rucio.common.utils import Color, StoreAndDeprecateWarningAction, chunks, detect_client_location, extract_scope, parse_did_filter_from_string, parse_did_filter_from_string_fe, setup_logger, sizefmt
-from tabulate import tabulate
 
 EXTRA_MODULES = import_extras(['argcomplete'])
 

bin/rucio-admin

@@ -28,6 +28,8 @@ from configparser import NoOptionError, NoSectionError
 from functools import wraps
 from textwrap import dedent
 
+from tabulate import tabulate
+
 from rucio import version
 from rucio.client import Client
 from rucio.common.config import config_get
@@ -53,7 +55,6 @@ from rucio.common.exception import (
 from rucio.common.extra import import_extras
 from rucio.common.utils import StoreAndDeprecateWarningAction, chunks, clean_surls, construct_surl, extract_scope, get_bytes_value_from_string, parse_response, render_json, sizefmt
 from rucio.rse import rsemanager as rsemgr
-from tabulate import tabulate
 
 EXTRA_MODULES = import_extras(['argcomplete'])
 

bin/rucio-cache-client

@@ -26,6 +26,7 @@ import sys
 
 import stomp
 from jsonschema import validate
+
 from rucio.client.didclient import DIDClient
 from rucio.client.rseclient import RSEClient
 from rucio.common.config import config_get, config_get_int

bin/rucio-dumper

@@ -18,9 +18,10 @@ import datetime
 import logging
 import sys
 
+import tabulate
+
 import rucio.common.dumper.consistency as consistency
 import rucio.common.dumper.data_models as data_models
-import tabulate
 from rucio.common.dumper import error
 
 logger = logging.getLogger('rucio-dumper')

lib/rucio/db/sqla/migrate_repo/versions/01eaf73ab656_add_new_rule_notification_state_progress.py

@@ -16,6 +16,7 @@
 
 from alembic import context, op
 from alembic.op import create_check_constraint
+
 from rucio.db.sqla.util import try_drop_constraint
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/0f1adb7a599a_create_transfer_hops_table.py

@@ -19,6 +19,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import create_check_constraint, create_foreign_key, create_index, create_primary_key, create_table, drop_table
+
 from rucio.db.sqla.types import GUID
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/13d4f70c66a9_introduce_transfer_limits.py

@@ -18,6 +18,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import create_check_constraint, create_foreign_key, create_index, create_primary_key, create_table, drop_table
+
 from rucio.db.sqla.constants import TransferLimitDirection
 from rucio.db.sqla.types import GUID
 

lib/rucio/db/sqla/migrate_repo/versions/1677d4d803c8_split_rse_availability_into_multiple.py

@@ -17,9 +17,10 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import add_column, drop_column, get_bind
-from rucio.db.sqla.types import GUID
 from sqlalchemy.sql.expression import true
 
+from rucio.db.sqla.types import GUID
+
 # Alembic revision identifiers
 revision = "1677d4d803c8"
 down_revision = "fe1a65b176c9"

lib/rucio/db/sqla/migrate_repo/versions/1a29d6a9504c_add_didtype_chck_to_requests.py

@@ -17,6 +17,7 @@
 import sqlalchemy as sa
 from alembic import context, op
 from alembic.op import add_column, drop_column
+
 from rucio.db.sqla.constants import DIDType
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/1c45d9730ca6_increase_identity_length.py

@@ -17,6 +17,7 @@
 import sqlalchemy as sa
 from alembic import context, op
 from alembic.op import alter_column, create_check_constraint, create_foreign_key, drop_constraint, execute
+
 from rucio.db.sqla.util import try_drop_constraint
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/1d1215494e95_add_quarantined_replicas_table.py

@@ -19,6 +19,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import create_check_constraint, create_foreign_key, create_primary_key, create_table, drop_table
+
 from rucio.common.schema import get_schema_value
 from rucio.db.sqla.types import GUID
 

lib/rucio/db/sqla/migrate_repo/versions/1d96f484df21_asynchronous_rules_and_rule_approval.py

@@ -17,6 +17,7 @@
 import sqlalchemy as sa
 from alembic import context, op
 from alembic.op import add_column, create_check_constraint, drop_column
+
 from rucio.db.sqla.util import try_drop_constraint
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/1fc15ab60d43_add_message_history_table.py

@@ -19,6 +19,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import create_table, drop_table
+
 from rucio.db.sqla.types import GUID
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/2190e703eb6e_move_rse_settings_to_rse_attributes.py

@@ -17,6 +17,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import get_bind
+
 from rucio.db.sqla.types import GUID, BooleanString
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/21d6b9dc9961_add_mismatch_scheme_state_to_requests.py

@@ -16,6 +16,7 @@
 
 from alembic import context, op
 from alembic.op import create_check_constraint
+
 from rucio.db.sqla.util import try_drop_constraint
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/22d887e4ec0a_create_sources_table.py

@@ -19,6 +19,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import create_check_constraint, create_foreign_key, create_index, create_primary_key, create_table, drop_table
+
 from rucio.db.sqla.types import GUID
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/277b5fbb41d3_switch_heartbeats_executable.py

@@ -17,6 +17,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import add_column, create_primary_key, drop_column, drop_constraint
+
 from rucio.db.sqla.models import String
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/2854cd9e168_added_rule_id_column.py

@@ -17,6 +17,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import add_column, drop_column
+
 from rucio.db.sqla.types import GUID
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/2af3291ec4c_added_replicas_history_table.py

@@ -17,6 +17,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import create_check_constraint, create_foreign_key, create_primary_key, create_table, drop_constraint, drop_table
+
 from rucio.db.sqla.types import GUID
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/2edee4a83846_add_source_to_requests_and_requests_.py

@@ -17,6 +17,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import add_column, drop_column
+
 from rucio.db.sqla.types import GUID
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/3082b8cef557_add_naming_convention_table_and_closed_.py

@@ -19,6 +19,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import add_column, create_check_constraint, create_foreign_key, create_primary_key, create_table, drop_column, drop_table
+
 from rucio.common.schema import get_schema_value
 from rucio.db.sqla.constants import KeyType
 

lib/rucio/db/sqla/migrate_repo/versions/3152492b110b_added_staging_area_column.py

@@ -17,6 +17,7 @@
 import sqlalchemy as sa
 from alembic import context, op
 from alembic.op import add_column, create_check_constraint, drop_column, drop_constraint
+
 from rucio.db.sqla.util import try_drop_constraint
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/32c7d2783f7e_create_bad_replicas_table.py

@@ -19,6 +19,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import create_check_constraint, create_foreign_key, create_index, create_primary_key, create_table, drop_table
+
 from rucio.db.sqla.types import GUID
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/379a19b5332d_create_rse_limits_table.py

@@ -19,6 +19,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import create_check_constraint, create_foreign_key, create_primary_key, create_table, drop_table
+
 from rucio.db.sqla.types import GUID
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/384b96aa0f60_created_rule_history_tables.py

@@ -19,6 +19,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import create_index, create_primary_key, create_table, drop_index, drop_table
+
 from rucio.db.sqla.constants import DIDType, RuleGrouping, RuleNotification, RuleState
 from rucio.db.sqla.types import GUID
 

lib/rucio/db/sqla/migrate_repo/versions/3ad36e2268b0_create_collection_replicas_updates_table.py

@@ -19,6 +19,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import add_column, create_check_constraint, create_index, create_primary_key, create_table, drop_column, drop_constraint, drop_index, drop_table
+
 from rucio.db.sqla.constants import DIDType
 from rucio.db.sqla.types import GUID
 

lib/rucio/db/sqla/migrate_repo/versions/3c9df354071b_extend_waiting_request_state.py

@@ -16,6 +16,7 @@
 
 from alembic import context, op
 from alembic.op import create_check_constraint
+
 from rucio.db.sqla.util import try_drop_constraint
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/3d9813fab443_add_a_new_state_lost_in_badfilesstatus.py

@@ -16,6 +16,7 @@
 
 from alembic import context
 from alembic.op import create_check_constraint
+
 from rucio.db.sqla.util import try_drop_constraint
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/4207be2fd914_add_notification_column_to_rules.py

@@ -17,6 +17,7 @@
 import sqlalchemy as sa
 from alembic import context, op
 from alembic.op import add_column, drop_column
+
 from rucio.db.sqla.constants import RuleNotification
 from rucio.db.sqla.util import try_drop_constraint
 

lib/rucio/db/sqla/migrate_repo/versions/45378a1e76a8_create_collection_replica_table.py

@@ -19,6 +19,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import create_check_constraint, create_foreign_key, create_index, create_primary_key, create_table, drop_table
+
 from rucio.db.sqla.constants import DIDType, ReplicaState
 from rucio.db.sqla.types import GUID
 from rucio.db.sqla.util import try_drop_constraint

lib/rucio/db/sqla/migrate_repo/versions/4783c1f49cb4_create_distance_table.py

@@ -19,6 +19,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import create_check_constraint, create_foreign_key, create_index, create_primary_key, create_table, drop_table
+
 from rucio.db.sqla.types import GUID
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/4df2c5ddabc0_remove_temporary_dids.py

@@ -17,6 +17,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import create_index, create_primary_key, create_table, drop_table
+
 from rucio.common.schema import get_schema_value
 from rucio.db.sqla.types import GUID, InternalScopeString
 

lib/rucio/db/sqla/migrate_repo/versions/575767d9f89_added_source_history_table.py

@@ -17,6 +17,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import add_column, create_table, drop_column, drop_table
+
 from rucio.db.sqla.types import GUID
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/58c8b78301ab_rename_callback_to_message.py

@@ -16,6 +16,7 @@
 
 from alembic import context, op
 from alembic.op import create_check_constraint, create_primary_key, drop_constraint, rename_table
+
 from rucio.db.sqla.util import try_drop_constraint
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/5f139f77382a_added_child_rule_id_column.py

@@ -17,6 +17,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import add_column, create_foreign_key, create_index, drop_column, drop_constraint, drop_index
+
 from rucio.db.sqla.types import GUID
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/688ef1840840_adding_did_meta_table.py

@@ -17,6 +17,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import create_foreign_key, create_primary_key, create_table, drop_table
+
 from rucio.db.sqla.types import JSON
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/7541902bf173_add_didsfollowed_and_followevents_table.py

@@ -19,6 +19,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import create_check_constraint, create_foreign_key, create_index, create_primary_key, create_table, drop_table
+
 from rucio.db.sqla.constants import DIDType
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/7ec22226cdbf_new_replica_state_for_temporary_.py

@@ -16,6 +16,7 @@
 
 from alembic import context, op
 from alembic.op import create_check_constraint
+
 from rucio.db.sqla.util import try_drop_constraint
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/914b8f02df38_new_table_for_lifetime_model_exceptions.py

@@ -19,6 +19,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import create_check_constraint, create_primary_key, create_table, drop_table
+
 from rucio.db.sqla.constants import DIDType, LifetimeExceptionsState
 from rucio.db.sqla.types import GUID
 

lib/rucio/db/sqla/migrate_repo/versions/9a1b149a2044_add_saml_identity_type.py

@@ -16,6 +16,7 @@
 
 from alembic import context
 from alembic.op import create_check_constraint, drop_constraint, execute
+
 from rucio.db.sqla.util import try_drop_constraint
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/9a45bc4ea66d_add_vp_table.py

@@ -17,6 +17,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import create_foreign_key, create_primary_key, create_table, drop_table
+
 from rucio.common.schema import get_schema_value
 from rucio.db.sqla.types import JSON
 

lib/rucio/db/sqla/migrate_repo/versions/a08fa8de1545_transfer_stats_table.py

@@ -19,6 +19,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import create_check_constraint, create_foreign_key, create_index, create_primary_key, create_table, drop_table
+
 from rucio.db.sqla.types import GUID
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/a616581ee47_added_columns_to_table_requests.py

@@ -17,6 +17,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import add_column, drop_column
+
 from rucio.db.sqla.models import String
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/ae2a56fcc89_added_comment_column_to_rules.py

@@ -17,6 +17,7 @@
 import sqlalchemy as sa
 from alembic import context
 from alembic.op import add_column, drop_column
+
 from rucio.db.sqla.models import String
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/b7d287de34fd_removal_of_replicastate_source.py

@@ -16,6 +16,7 @@
 
 from alembic import context, op
 from alembic.op import create_check_constraint
+
 from rucio.db.sqla.util import try_drop_constraint
 
 # Alembic revision identifiers

lib/rucio/db/sqla/migrate_repo/versions/b96a1c7e1cc4_new_bad_pfns_table_and_bad_replicas_.py

@@ -19,6 +19,7 @@
 import sqlalchemy as sa
 from alembic import context, op
 from alembic.op import add_column, create_check_constraint, create_foreign_key, create_index, create_primary_key, create_table, drop_column, drop_constraint, drop_index, drop_table
+
 from rucio.db.sqla.constants import BadPFNStatus
 from rucio.db.sqla.util import try_drop_constraint