Merge pull request #374 from lsst-sqre/tickets/DM-46480

tickets/DM-46480: adopt shared rubin-nublado-client
lsst-sqre · Oct 29, 2024 · be04caa · be04caa
2 parents 76dd4f6 + 749606c
commit be04caa
Show file tree

Hide file tree

Showing 27 changed files with 2,681 additions and 3,097 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,20 +1,20 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: check-yaml
       - id: check-toml
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.2
+    rev: v0.7.1
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
 
   - repo: https://github.com/adamchainz/blacken-docs
-    rev: 1.18.0
+    rev: 1.19.1
     hooks:
       - id: blacken-docs
         additional_dependencies: [black==24.3.0]

diff --git a/changelog.d/20241017_100200_athornton_DM_46480.md b/changelog.d/20241017_100200_athornton_DM_46480.md
@@ -0,0 +1,5 @@
+<!-- Delete the sections that don't apply -->
+
+### Other changes
+
+- Replace internal client with rubin-nublado-client from `nublado` repo.
diff --git a/pyproject.toml b/pyproject.toml
@@ -95,6 +95,7 @@ warn_required_dynamic_aliases = true
 warn_untyped_fields = true
 
 [tool.pytest.ini_options]
+asyncio_default_fixture_loop_scope = "function"
 asyncio_mode = "strict"
 filterwarnings = [
     # Bug in aiojobs
@@ -124,6 +125,9 @@ extend = "ruff-shared.toml"
 "src/mobu/services/business/tap.py" = [
     "ASYNC110", # TAP code could be rewritten to poll state differently
 ]
+"src/mobu/services/monkey.py" = [
+    "SIM115", # We do want a NamedTemporaryFile not in a context manager
+]
 "tests/data/**/*.ipynb" = [
     "T201",     # test notebooks are allowed to use print
 ]

diff --git a/requirements/dev.txt b/requirements/dev.txt
diff --git a/requirements/main.in b/requirements/main.in
@@ -18,9 +18,16 @@ httpx
 httpx-sse
 jinja2
 pydantic>2
-pydantic-settings
+pydantic-settings==2.5.2
+# 2.6 dies horribly with:
+# pydantic_core._pydantic_core.ValidationError: 1 validation error for GitHubRefreshAppConfig
+# MOBU_GITHUB_REFRESH_APP_WEBHOOK_SECRET
+#   Field required [type=missing, input_value={'accepted_github_orgs': ...', 'org2', 'lsst-sqre']}, input_type=dict]
+#     For further information visit https://errors.pydantic.dev/2.9/v/missing
 pyvo
 pyyaml
+#rubin-nublado-client@git+https://github.com/lsst-sqre/nublado@tickets/DM-46480#subdirectory=client
+rubin.nublado.client
 safir>=6.1.0
 shortuuid
 structlog

diff --git a/requirements/main.txt b/requirements/main.txt
diff --git a/src/mobu/__init__.py b/src/mobu/__init__.py
@@ -1,6 +1,6 @@
 """The mobu service."""
 
-__all__ = ["__version__", "metadata"]
+__all__ = ["__version__", "metadata", "main"]
 
 from importlib.metadata import PackageNotFoundError, version