[pre-commit.ci] Apply automatic pre-commit fixes

conda-store-server/conda_store_server/__init__.py

@@ -1,7 +1,9 @@
 import datetime
 import typing
+
 from pathlib import Path
 
+
 __version__ = "2024.3.1"
 
 

conda-store-server/conda_store_server/action/add_conda_prefix_packages.py

@@ -4,6 +4,7 @@
 import pathlib
 
 from conda.core.prefix_data import PrefixData
+
 from conda_store_server import action, api
 
 

conda-store-server/conda_store_server/action/add_lockfile_packages.py

@@ -1,6 +1,7 @@
 import typing
 
 from conda.models.dist import Dist
+
 from conda_store_server import action, api, conda_utils
 
 

conda-store-server/conda_store_server/action/download_packages.py

@@ -10,6 +10,7 @@
 import conda_package_handling.api
 import conda_package_streaming.url
 import filelock
+
 from conda.base.constants import PACKAGE_CACHE_MAGIC_FILE
 from conda.common.path import expand, strip_pkg_extension
 from conda.core.package_cache_data import (
@@ -20,6 +21,7 @@
     write_as_json_to_file,
 )
 from conda.gateways.disk.update import touch
+
 from conda_store_server import action, conda_utils
 
 

conda-store-server/conda_store_server/action/generate_conda_pack.py

@@ -1,6 +1,7 @@
 import pathlib
 
 import conda_pack
+
 from conda_store_server import action
 
 

conda-store-server/conda_store_server/action/generate_constructor_installer.py

@@ -5,6 +5,7 @@
 import warnings
 
 import yaml
+
 from conda_store_server import action, schema
 from conda_store_server.action.utils import logged_command
 

conda-store-server/conda_store_server/action/generate_lockfile.py

@@ -4,7 +4,9 @@
 import typing
 
 import yaml
+
 from conda_lock.conda_lock import run_lock
+
 from conda_store_server import action, conda_utils, schema
 from conda_store_server.action.utils import logged_command
 

conda-store-server/conda_store_server/alembic/env.py

@@ -3,6 +3,7 @@
 from alembic import context
 from sqlalchemy import engine_from_config, pool
 
+
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
 config = context.config
@@ -22,10 +23,12 @@
 # assumes that alembic is inside directory conda_store_server/alembic/env.py
 import sys  # noqa E402
 
+
 sys.path.append(str(pathlib.Path(__file__).parent.parent.parent))
 
 from conda_store_server.orm import Base  # noqa E402
 
+
 target_metadata = Base.metadata
 
 

conda-store-server/conda_store_server/alembic/versions/03c839888c82_add_canceled_status.py

@@ -7,8 +7,10 @@
 """
 
 import sqlalchemy as sa
+
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = "03c839888c82"
 down_revision = "57cd11b949d5"

conda-store-server/conda_store_server/alembic/versions/0f7e23ff24ee_add_worker.py

@@ -7,8 +7,10 @@
 """
 
 import sqlalchemy as sa
+
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = "0f7e23ff24ee"
 down_revision = "771180018e1b"

conda-store-server/conda_store_server/alembic/versions/16f65805dc8f_split_conda_package_into_conda_package_.py

@@ -7,8 +7,10 @@
 """
 
 import sqlalchemy as sa
+
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = "16f65805dc8f"
 down_revision = "5ad723de2abd"

conda-store-server/conda_store_server/alembic/versions/30b37e725c32_add_build_key_version.py

@@ -7,8 +7,10 @@
 """
 
 import sqlalchemy as sa
+
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = "30b37e725c32"
 down_revision = "d78e9889566a"

conda-store-server/conda_store_server/alembic/versions/48be4072fe58_initial_schema.py

@@ -7,8 +7,10 @@
 """
 
 import sqlalchemy as sa
+
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = "48be4072fe58"
 down_revision = None

conda-store-server/conda_store_server/alembic/versions/57cd11b949d5_add_installer.py

@@ -7,8 +7,10 @@
 """
 
 import sqlalchemy as sa
+
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = "57cd11b949d5"
 down_revision = "0f7e23ff24ee"

conda-store-server/conda_store_server/alembic/versions/5ad723de2abd_adding_container_registry_value_to_enum.py

@@ -7,8 +7,10 @@
 """
 
 import sqlalchemy as sa
+
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = "5ad723de2abd"
 down_revision = "8d63a091aff8"

conda-store-server/conda_store_server/alembic/versions/771180018e1b_add_v2_role_mappings.py

@@ -7,8 +7,10 @@
 """
 
 import sqlalchemy as sa
+
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = "771180018e1b"
 down_revision = "30b37e725c32"

conda-store-server/conda_store_server/alembic/versions/8d63a091aff8_add_environment_description.py

@@ -7,8 +7,10 @@
 """
 
 import sqlalchemy as sa
+
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = "8d63a091aff8"
 down_revision = "48be4072fe58"

conda-store-server/conda_store_server/alembic/versions/abd7248d5327_adding_a_settings_table.py

@@ -7,8 +7,10 @@
 """
 
 import sqlalchemy as sa
+
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = "abd7248d5327"
 down_revision = "16f65805dc8f"

conda-store-server/conda_store_server/alembic/versions/b387747ca9b7_role_mapping.py

@@ -7,8 +7,10 @@
 """
 
 import sqlalchemy as sa
+
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = "b387747ca9b7"
 down_revision = "abd7248d5327"

conda-store-server/conda_store_server/alembic/versions/d78e9889566a_add_status_info.py

@@ -7,8 +7,10 @@
 """
 
 import sqlalchemy as sa
+
 from alembic import op
 
+
 # revision identifiers, used by Alembic.
 revision = "d78e9889566a"
 down_revision = "b387747ca9b7"

conda-store-server/conda_store_server/api.py

@@ -1,10 +1,12 @@
 import re
+
 from typing import Any, Dict, List
 
-from conda_store_server import conda_utils, orm, schema, utils
 from sqlalchemy import distinct, func, null, or_
 from sqlalchemy.orm import aliased
 
+from conda_store_server import conda_utils, orm, schema, utils
+
 
 def list_namespaces(db, show_soft_deleted: bool = False):
     filters = []

conda-store-server/conda_store_server/app.py

@@ -1,23 +1,13 @@
 import datetime
 import os
 import sys
+
 from contextlib import contextmanager
 from typing import Any, Dict
 
 import pydantic
+
 from celery import Celery, group
-from conda_store_server import (
-    CONDA_STORE_DIR,
-    BuildKey,
-    api,
-    conda_utils,
-    environment,
-    orm,
-    registry,
-    schema,
-    storage,
-    utils,
-)
 from sqlalchemy.orm import Session
 from sqlalchemy.pool import QueuePool
 from traitlets import (
@@ -34,6 +24,19 @@
 )
 from traitlets.config import LoggingConfigurable
 
+from conda_store_server import (
+    CONDA_STORE_DIR,
+    BuildKey,
+    api,
+    conda_utils,
+    environment,
+    orm,
+    registry,
+    schema,
+    storage,
+    utils,
+)
+
 
 def conda_store_validate_specification(
     db: Session,

conda-store-server/conda_store_server/build.py

@@ -9,9 +9,11 @@
 import typing
 
 import yaml
+
+from sqlalchemy.orm import Session
+
 from conda_store_server import action, api, conda_utils, orm, schema, utils
 from conda_store_server.utils import BuildPathError
-from sqlalchemy.orm import Session
 
 
 def append_to_logs(db: Session, conda_store, build, logs: typing.Union[str, bytes]):

conda-store-server/conda_store_server/dbutil.py

@@ -1,11 +1,13 @@
 import os
+
 from contextlib import contextmanager
 from tempfile import TemporaryDirectory
 
 from alembic import command
 from alembic.config import Config
 from sqlalchemy import create_engine, inspect
 
+
 _here = os.path.abspath(os.path.dirname(__file__))
 
 ALEMBIC_INI_TEMPLATE_PATH = os.path.join(_here, "alembic.ini")

conda-store-server/conda_store_server/environment.py

@@ -2,6 +2,7 @@
 
 import pydantic
 import yaml
+
 from conda_store_server import conda_utils, schema
 
 

conda-store-server/conda_store_server/orm.py

@@ -6,9 +6,6 @@
 import shutil
 import sys
 
-from conda_store_server import conda_utils, schema, utils
-from conda_store_server.environment import validate_environment
-from conda_store_server.utils import BuildPathError
 from sqlalchemy import (
     JSON,
     BigInteger,
@@ -36,6 +33,11 @@
     validates,
 )
 
+from conda_store_server import conda_utils, schema, utils
+from conda_store_server.environment import validate_environment
+from conda_store_server.utils import BuildPathError
+
+
 logger = logging.getLogger("orm")
 
 Base = declarative_base()

conda-store-server/conda_store_server/registry.py

@@ -2,12 +2,13 @@
 import hashlib
 import urllib.parse
 
-from conda_store_server import orm, schema, utils
 from python_docker.registry import Image, Registry
 from sqlalchemy.orm import Session
 from traitlets import Callable, Dict, default
 from traitlets.config import LoggingConfigurable
 
+from conda_store_server import orm, schema, utils
+
 
 class ContainerRegistry(LoggingConfigurable):
     container_registries = Dict(

conda-store-server/conda_store_server/schema.py

@@ -4,11 +4,13 @@
 import os
 import re
 import sys
+
 from typing import Any, Callable, Dict, List, Optional, Union
 
-from conda_store_server import conda_utils, utils
 from pydantic import BaseModel, Field, ValidationError, constr, validator
 
+from conda_store_server import conda_utils, utils
+
 
 def _datetime_factory(offset: datetime.timedelta):
     """utcnow datetime + timezone as string"""

conda-store-server/conda_store_server/server/__main__.py

@@ -1,5 +1,6 @@
 from conda_store_server.server.app import CondaStoreServer
 
+
 main = CondaStoreServer.launch_instance
 
 if __name__ == "__main__":