Merge pull request #71 from DavidCEllis/multi-updates

Typing fixes and dependency updates, Python 3.12 new minimum

Author: DavidCEllis

.github/workflows/auto_test.yml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["3.14", "3.13", "3.12", "3.11", "3.10"]
+        python-version: ["3.15-dev", "3.14", "3.13", "3.12"]
 
     steps:
     - uses: actions/checkout@v6

.github/workflows/build_zipapp.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v6
       with:
-        python-version: "3.10"  # build with oldest supported python
+        python-version: "3.12"  # build with oldest supported python
     - name: Install the module
       run: |
         python -m pip install --upgrade pip

.github/workflows/publish_to_pypi.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v6
       with:
-        python-version: "3.10"
+        python-version: "3.12"
     - name: Install pypa/build
       run: >-
         python3 -m

.github/workflows/publish_to_testpypi.yml

@@ -12,14 +12,13 @@ authors = [
     { name = "David C Ellis" },
 ]
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.12"
 dependencies = [
-    "ducktools-classbuilder>=0.12.3",
-    "ducktools-lazyimporter>=0.7.0",
-    "ducktools-scriptmetadata>=0.2.0",
-    "ducktools-pythonfinder>=0.8.1",
-    "tomli>=2.2; python_version < '3.11'",
-    "packaging>=24.2",
+    "ducktools-classbuilder>=0.12.6",
+    "ducktools-lazyimporter>=0.8.4",
+    "ducktools-scriptmetadata>=0.2.1",
+    "ducktools-pythonfinder>=0.10.5",
+    "packaging>=26.0",
 ]
 classifiers = [
     "Development Status :: 2 - Pre-Alpha",
@@ -41,8 +40,8 @@ dynamic = ["version"]
 [dependency-groups]
 dev = [
     "coverage-conditional-plugin>=0.9.0",
-    "pytest>=8.4.0",
-    "pytest-cov>=6.2.1",
+    "pytest>=9.0",
+    "pytest-cov>=7.1",
 ]
 
 [tool.setuptools.packages.find]

pyproject.toml

@@ -29,13 +29,11 @@
 import itertools
 
 from ducktools.lazyimporter import LazyImporter, ModuleImport
-
 from ducktools.classbuilder import (
     SlotMakerMeta,
     builder,
     make_unified_gatherer,
 )
-
 from ducktools.classbuilder.prefab import (
     PREFAB_FIELDS,
     Attribute,
@@ -47,11 +45,37 @@
 )
 
 
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import dataclass_transform
+else:
+    def dataclass_transform(
+        *,
+        eq_default=True,
+        order_default=False,
+        kw_only_default=False,
+        frozen_default=False,
+        field_specifiers=(),
+        **kwargs
+    ):
+        def decorator(cls_or_fn):
+            cls_or_fn.__dataclass_transform__ = {
+                "eq_default": eq_default,
+                "order_default": order_default,
+                "kw_only_default": kw_only_default,
+                "frozen_default": frozen_default,
+                "field_specifiers": field_specifiers,
+                "kwargs": kwargs,
+            }
+            return cls_or_fn
+        return decorator
+
+
 # Unlike the other modules this has its own lazy importer
 # As it might be spun off as a separate package
 _laz = LazyImporter(
     [
-        ModuleImport("sqlite3", asname="sql")
+        ModuleImport("sqlite3", asname="sql"),
     ]
 )
 
@@ -113,7 +137,7 @@ def get_sql_fields(cls: "SQLMeta", local=False) -> dict[str, SQLAttribute]:
         k: SQLAttribute.from_field(v) if type(v) in parents else v
         for k, v in attribs.items()
     }
-    return attributes
+    return attributes  # type: ignore  # Bug in classbuilder stub file
 
 
 unified_gatherer = make_unified_gatherer(SQLAttribute)
@@ -148,6 +172,7 @@ class SQLMeta(SlotMakerMeta):
 default_methods = frozenset({init_maker, repr_maker, eq_maker})
 
 
+@dataclass_transform(kw_only_default=True, field_specifiers=(SQLAttribute,))
 class SQLClass(metaclass=SQLMeta):
     _meta_gatherer = unified_gatherer
     __slots__ = {}
@@ -167,7 +192,7 @@ def __init_subclass__(
             methods=methods,
             flags={"slotted": slots, "kw_only": True},
             field_getter=get_sql_fields,
-        )
+        )  # type: ignore  # Another complex typing issue with classbuilder
 
         fields = get_sql_fields(cls)
         valid_fields = {}
@@ -201,11 +226,11 @@ def __init_subclass__(
         for name, field in fields.items():
             if field.primary_key:
                 if primary_key is not None:
-                    raise AttributeError("sqlclass *must* have **only** one primary key")
+                    raise AttributeError("SQLClass *must* have **only** one primary key")
                 primary_key = name
 
         if primary_key is None:
-            raise AttributeError("sqlclass *must* have one primary key")
+            raise AttributeError("SQLClass *must* have one primary key")
 
         cls.PK_NAME = primary_key
         cls.TABLE_NAME = caps_to_snake(cls.__name__)
@@ -398,7 +423,7 @@ def update_row(self, con, columns: list[str]):
         search_condition = f"{self.PK_NAME} = :{self.PK_NAME}"
 
         with con:
-            result = con.execute(
+            con.execute(
                 f"UPDATE {self.TABLE_NAME} SET {set_columns} WHERE {search_condition}",
                 processed_values,
             )

src/ducktools/env/_sqlclasses.py

@@ -62,17 +62,18 @@ def as_version(self):
 
 # This is mostly kept for testing.
 PREVIOUS_PIP = PipZipapp(
-    version_str="25.1.1",
-    sha3_256="19cea26421fcda28baa6a54f3e9be60a9ea06e85bf9b91f627de18bed0d0dc7b",
-    source_url="zipapp/pip-25.1.1.pyz",
-)
-
-LATEST_PIP = PipZipapp(
     version_str="25.3",
     sha3_256="a619d1451f2c42c072e0005d98c8a0fdd60ec1f033597a91f8b46c416c338fb6",
     source_url="zipapp/pip-25.3.pyz",
 )
 
+LATEST_PIP = PipZipapp(
+    version_str="26.0.1",
+    sha3_256="fe1f58ec30e3b09a0fa54619f55750682549364670fc206995e1b72c24157011",
+    source_url="zipapp/pip-26.0.1.pyz",
+)
+
+
 def is_pip_outdated(
     paths: ManagedPaths,
     latest_version: PipZipapp = LATEST_PIP

src/ducktools/env/scripts/get_pip.py

@@ -20,18 +20,13 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-import sys
-
-
 from .._logger import log
 from .. import _lazy_imports as _laz
 
 
 uv_versionspec = ">=0.7.0"
 uv_versionre = r"^uv (?P<uv_ver>\d+\.\d+\.\d+)"
 
-uv_download = "bin/uv.exe" if sys.platform == "win32" else "bin/uv"
-
 
 def get_local_uv():
     """