Merge pull request #113 from lsst-sqre/t/DM-54252

DM-54252: Update Python and pre-commit dependencies

Author: rra

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-merge-conflict
       - id: check-toml
@@ -9,12 +9,12 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.7.11
+    rev: 0.10.5
     hooks:
       - id: uv-lock
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.13
+    rev: v0.15.2
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

pyproject.toml

@@ -41,6 +41,32 @@ crawlspace = "crawlspace.cli:main"
 requires = ["setuptools>=61", "wheel", "setuptools_scm[toml]>=6.2"]
 build-backend = "setuptools.build_meta"
 
+[dependency-groups]
+dev = [
+    "asgi-lifespan",
+    "coverage[toml]",
+    "httpx",
+    "pytest",
+    "pytest-asyncio",
+    "pytest-cov",
+    "pytest-sugar",
+    "scriv[toml]>=1.5",
+]
+lint = [
+    "pre-commit",
+    "pre-commit-uv",
+    "ruff>=0.9",
+]
+tox = [
+    "tox>=4.24",
+    "tox-docker>=5",
+    "tox-uv>=1.25",
+]
+typing = [
+    "mypy>=1.15",
+    "types-pyyaml>=6",
+]
+
 [tool.coverage.run]
 parallel = true
 branch = true
@@ -87,7 +113,7 @@ asyncio_default_fixture_loop_scope = "function"
 asyncio_mode = "strict"
 # The python_files setting is not for test detection (pytest will pick up any
 # test files named *_test.py without this setting) but to enable special
-# assert processing in any non-test supporting files under tests.  We
+# assert processing in any non-test supporting files under tests. We
 # conventionally put test support functions under tests.support and may
 # sometimes use assert in test fixtures in conftest.py, and pytest only
 # enables magical assert processing (showing a full diff on assert failures
@@ -103,7 +129,6 @@ extend = "ruff-shared.toml"
 
 [tool.ruff.lint.isort]
 known-first-party = ["crawlspace", "tests"]
-split-on-trailing-comma = false
 
 [tool.scriv]
 categories = [
@@ -118,33 +143,4 @@ md_header_level = "2"
 new_fragment_template = "file:changelog.d/_template.md.jinja"
 skip_fragments = "_template.md.jinja"
 
-[dependency-groups]
-dev = [
-    "asgi-lifespan",
-    "coverage[toml]",
-    "httpx",
-    "pytest",
-    "pytest-asyncio",
-    "pytest-cov",
-    "pytest-sugar",
-    "scriv[toml]>=1.5",
-]
-
-lint = [
-    "pre-commit",
-    "pre-commit-uv",
-    "ruff>=0.9",
-]
-
-tox = [
-    "tox>=4.24",
-    "tox-docker>=5",
-    "tox-uv>=1.25",
-]
-
-typing = [
-    "mypy>=1.15",
-    "types-pyyaml>=6",
-]
-
 [tool.setuptools_scm]

ruff-shared.toml

@@ -20,7 +20,6 @@
 # Reference for rules: https://docs.astral.sh/ruff/rules/
 exclude = ["docs/**"]
 line-length = 79
-target-version = "py312"
 
 [format]
 docstring-code-format = true
@@ -34,6 +33,7 @@ ignore = [
     "ARG003",   # unused class method arguments are often legitimate
     "ARG005",   # unused lambda arguments are often legitimate
     "ASYNC109", # many async functions use asyncio.timeout internally
+    "ASYNC240", # we don't want to run filesystem operations on threads
     "BLE001",   # we want to catch and report Exception in background tasks
     "C414",     # nested sorted is how you sort by multiple keys with reverse
     "D102",     # sometimes we use docstring inheritence
@@ -147,5 +147,8 @@ builtins-ignorelist = [
 fixture-parentheses = false
 mark-parentheses = false
 
+[lint.isort]
+split-on-trailing-comma = false
+
 [lint.pydocstyle]
 convention = "numpy"

src/crawlspace/services/file.py

@@ -51,7 +51,7 @@ def from_blob(cls, path: str, blob: storage.Blob) -> CrawlspaceFile:
             media_type = "application/x-votable+xml"
         else:
             guessed_type, _ = guess_type(path)
-            media_type = guessed_type if guessed_type else "text/plain"
+            media_type = guessed_type or "text/plain"
         return cls(blob=blob, headers=headers, media_type=media_type)
 
     def download_as_bytes(self) -> bytes: