Widen dependency support and bump dev deps (#262)

nathanjmcdougall · web-flow · commit 0e510524496f · 2025-02-05T23:20:43.000+13:00
* Widen dependency support and bump dev deps Skip flaky ruff subprocess steps (see #45) * Only run pre-commit on one CI matrix entry * Bump typer lower bound to fix click incompatibility * Bump tomlkit - might fix CI * Bisect tomlkit version * Bisect tomlkit version * Bisect tomlkit version
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,6 +34,7 @@ jobs:
           uv pip install --system --break-system-packages -r requirements.txt
 
       - name: Run pre-commit
+        if: matrix.pre-commit
         run: |
           uv run --frozen pre-commit run --all-files
 
@@ -53,12 +54,15 @@ jobs:
         python-version: ["3.10", "3.11", "3.12", "3.13"]
         resolution: ["highest"]
         codspeed: [false]
+        pre-commit: [false]
         include:
           - os: "ubuntu-latest"
             python-version: "3.10"
             resolution: "lowest-direct"
             codspeed: false
+            pre-commit: false
           - os: "ubuntu-latest"
             python-version: "3.13"
             resolution: "highest"
             codspeed: true
+            pre-commit: true
diff --git a/pyproject.toml b/pyproject.toml
@@ -34,33 +34,33 @@ dynamic = [
   "version",
 ]
 dependencies = [
-  "mergedeep>=1.3.4",
-  "packaging>=24.1",
-  "pydantic>=2.9.2",
-  "requests>=2.32.3",
-  "rich>=13.8.1",
-  "ruamel-yaml>=0.18.6",
-  "tomlkit>=0.13.2",
-  "typer>=0.12.5",
-  "typing-extensions>=4.12.2",
+  "mergedeep>=1.3.1",
+  "packaging>=20.9",
+  "pydantic>=2.5.0",
+  "requests>=2.26.0",
+  "rich>=9.6.1",
+  "ruamel-yaml>=0.16.13",
+  "tomlkit>=0.12.0",
+  "typer>=0.4.1",
+  "typing-extensions>=3.10.0.0",
 ]
 scripts.usethis = "usethis.__main__:app"
 
 [dependency-groups]
 dev = [
-  "datamodel-code-generator[http]>=0.26.2",
+  "datamodel-code-generator[http]>=0.26.5",
   "deptry>=0.23.0",
   "import-linter>=2.1",
-  "pre-commit>=4.0.1",
-  "pyright>=1.1.391",
+  "pre-commit>=4.1.0",
+  "pyright>=1.1.393",
   "ruff>=0.9.4",
 ]
 test = [
-  "coverage[toml]>=7.6.3",
-  "gitpython>=3.1.43",
-  "pytest>=8.3.2",
-  "pytest-codspeed>=3.1.2",
-  "pytest-cov>=5.0.0",
+  "coverage[toml]>=7.6.10",
+  "gitpython>=3.1.44",
+  "pytest>=8.3.4",
+  "pytest-codspeed>=3.2.0",
+  "pytest-cov>=6.0.0",
   "pytest-emoji>=0.2.0",
   "pytest-md>=0.2.0",
 ]
diff --git a/src/usethis/_integrations/bitbucket/schema.py b/src/usethis/_integrations/bitbucket/schema.py
@@ -4,7 +4,7 @@
 # using the command:
 #   datamodel-codegen --input tests\usethis\_integrations\bitbucket\schema.json --input-file-type jsonschema --output src\usethis\_integrations\bitbucket\schema.py --enum-field-as-literal all --field-constraints --use-double-quotes --use-union-operator --use-standard-collections --use-default-kwarg --output-model-type pydantic_v2.BaseModel --target-python-version 3.10
 # ruff: noqa: ERA001
-# pyright: reportGeneralTypeIssues=false
+# pyright: reportAssignmentType=false
 # plus manually add Definitions.scripts for type hinting
 # plus manually add ScriptItemAnchor as a root type of Script, and import it
 # plus manually forbid StepItem.step from being None
diff --git a/src/usethis/_integrations/pyproject/core.py b/src/usethis/_integrations/pyproject/core.py
@@ -2,7 +2,7 @@
 
 import mergedeep
 from pydantic import TypeAdapter
-from tomlkit import TOMLDocument
+from tomlkit.toml_document import TOMLDocument
 
 from usethis._integrations.pyproject.errors import (
     PyProjectTOMLValueAlreadySetError,
diff --git a/src/usethis/_integrations/pyproject/io_.py b/src/usethis/_integrations/pyproject/io_.py
@@ -1,23 +1,24 @@
 from functools import cache
 from pathlib import Path
 
-import tomlkit
+from tomlkit.api import dumps, parse
 from tomlkit.exceptions import TOMLKitError
+from tomlkit.toml_document import TOMLDocument
 
 from usethis._integrations.pyproject.errors import (
     PyProjectTOMLDecodeError,
     PyProjectTOMLNotFoundError,
 )
 
 
-def read_pyproject_toml() -> tomlkit.TOMLDocument:
+def read_pyproject_toml() -> TOMLDocument:
     return read_pyproject_toml_from_path(Path.cwd() / "pyproject.toml")
 
 
 @cache
-def read_pyproject_toml_from_path(path: Path) -> tomlkit.TOMLDocument:
+def read_pyproject_toml_from_path(path: Path) -> TOMLDocument:
     try:
-        return tomlkit.parse(path.read_text())
+        return parse(path.read_text())
     except FileNotFoundError:
         msg = "'pyproject.toml' not found in the current directory."
         raise PyProjectTOMLNotFoundError(msg)
@@ -26,6 +27,6 @@ def read_pyproject_toml_from_path(path: Path) -> tomlkit.TOMLDocument:
         raise PyProjectTOMLDecodeError(msg) from None
 
 
-def write_pyproject_toml(toml_document: tomlkit.TOMLDocument) -> None:
+def write_pyproject_toml(toml_document: TOMLDocument) -> None:
     read_pyproject_toml_from_path.cache_clear()
-    (Path.cwd() / "pyproject.toml").write_text(tomlkit.dumps(toml_document))
+    (Path.cwd() / "pyproject.toml").write_text(dumps(toml_document))
diff --git a/tests/usethis/_core/test_tool.py b/tests/usethis/_core/test_tool.py
@@ -1,3 +1,4 @@
+import os
 import subprocess
 from pathlib import Path
 
@@ -204,7 +205,9 @@ def test_run_deptry_fail(self, uv_init_dir: Path):
 
             # Assert
             with pytest.raises(subprocess.CalledProcessError):
-                subprocess.run(["deptry", "."], cwd=uv_init_dir, check=True)
+                subprocess.run(
+                    ["uv", "run", "deptry", "."], cwd=uv_init_dir, check=True
+                )
 
         @pytest.mark.usefixtures("_vary_network_conn")
         def test_run_deptry_pass(self, uv_init_dir: Path):
@@ -217,7 +220,7 @@ def test_run_deptry_pass(self, uv_init_dir: Path):
                 use_deptry()
 
             # Assert
-            subprocess.run(["deptry", "."], cwd=uv_init_dir, check=True)
+            subprocess.run(["uv", "run", "deptry", "."], cwd=uv_init_dir, check=True)
 
         @pytest.mark.usefixtures("_vary_network_conn")
         def test_pre_commit_after(
@@ -1239,6 +1242,10 @@ def test_blank_slate(self, uv_init_dir: Path):
             # Assert
             assert (uv_init_dir / "pyproject.toml").read_text() == contents
 
+        @pytest.mark.skipif(
+            not os.getenv("CI"),
+            reason="https://github.com/nathanjmcdougall/usethis-python/issues/45",
+        )
         @pytest.mark.usefixtures("_vary_network_conn")
         def test_roundtrip(self, uv_init_dir: Path):
             # Arrange
@@ -1292,6 +1299,10 @@ def test_use_after(self, uv_init_repo_dir: Path):
             assert "ruff-format" in hook_names
             assert "ruff" in hook_names
 
+        @pytest.mark.skipif(
+            not os.getenv("CI"),
+            reason="https://github.com/nathanjmcdougall/usethis-python/issues/45",
+        )
         @pytest.mark.usefixtures("_vary_network_conn")
         def test_remove(
             self, uv_init_repo_dir: Path, capfd: pytest.CaptureFixture[str]
diff --git a/uv.lock b/uv.lock
