Merge branch 'main' into feat/hk_manage

.github/workflows/pre-commit_autoupdate.yaml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
       - uses: browniebroke/pre-commit-autoupdate-action@main
-      - uses: peter-evans/create-pull-request@v6
+      - uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: update/pre-commit-hooks

pyproject.toml

@@ -17,31 +17,31 @@ packages = [
 
 [tool.poetry.dependencies]
 python = ">=3.10,<3.13"
-pyyaml = "^6.0.1"
+pyyaml = "^6.0.2"
 typing-extensions = "^4.9.0"
-pydantic = "^2.6.1"
+pydantic = "^2.10.2"
 space-packet-parser = "^5.0.1"
 xarray = "^2024.7.0"
-numpy = "^2.0.1"
-typer = "^0.12.3"
-sqlalchemy = "^2.0.31"
+numpy = "^2.1.3"
+typer = "^0.12.5"
+sqlalchemy = "^2.0.35"
 alembic = "^1.13.2"
 sqlalchemy-utils = "^0.41.2"
 requests = "^2.32.3"
 pandas = "^2.2.2"
-imap-data-access = "^0.9.0"
+imap-data-access = "^0.11.0"
 cdflib = "^1.3.1"
 psycopg = {extras = ["binary"], version = "^3.2.1"}
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.3.1"
 pytest-cov = "^5.0.0"
 pytest-mock = "^3.14.0"
-pyinstaller = "^6.5.0"
+pyinstaller = "^6.10.0"
 pre-commit = "^3.8.0"
-ruff = "^0.5.4"
+ruff = "^0.8.1"
 docker = "^7.1.0"
-testcontainers = "^4.7.2"
+testcontainers = "^4.8.1"
 wiremock = {git = "https://github.com/ImperialCollegeLondon/python-wiremock.git", rev = "fix-test-containers-on-windows"}
 
 [tool.poetry.scripts]

src/imap_db/migrations/env.py

@@ -1,9 +1,10 @@
 from logging.config import fileConfig
 
 from alembic import context
-from imap_db.model import Base
 from sqlalchemy import engine_from_config, pool
 
+from imap_db.model import Base
+
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
 config = context.config

src/imap_mag/DB.py

@@ -4,10 +4,10 @@
 from pathlib import Path
 
 import typer
-from imap_db.model import File
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 
+from imap_db.model import File
 from imap_mag import __version__
 from imap_mag.outputManager import IFileMetadataProvider, IOutputManager, generate_hash
 

src/imap_mag/main.py

@@ -13,6 +13,7 @@
 
 # config
 import yaml
+
 from mag_toolkit import CDFLoader
 from mag_toolkit.calibration.CalibrationApplicator import CalibrationApplicator
 from mag_toolkit.calibration.calibrationFormatProcessor import (

tests/testUtils.py

@@ -1,9 +1,10 @@
 import os
 from pathlib import Path, PosixPath, WindowsPath
 
-import imap_mag.appConfig as appConfig
 import pytest
 import yaml
+
+import imap_mag.appConfig as appConfig
 from imap_mag import appLogging
 
 

tests/test_main.py

@@ -8,10 +8,11 @@
 from pathlib import Path
 
 import pytest
-from imap_mag.main import app
 from typer.testing import CliRunner
 
-from .testUtils import create_serialize_config, tidyDataFolders  # noqa: F401
+from imap_mag.main import app
+
+from .testUtils import create_serialize_config
 from .wiremockUtils import wiremock_manager  # noqa: F401
 
 runner = CliRunner()