ducktools-classbuilder 0.9.0__tar.gz → 0.10.0__tar.gz

{ducktools_classbuilder-0.9.0 → ducktools_classbuilder-0.10.0}/.github/workflows/auto_test.yml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: ["3.14-dev", "3.13", "3.12", "3.11", "3.10", "pypy-3.10", "3.9", "3.8"]
+        python-version: ["3.14-dev", "3.13", "3.12", "3.11", "pypy-3.11", "3.10"]
 
     steps:
     - uses: actions/checkout@v4
@@ -25,7 +25,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install -e .[testing]
+        python -m pip install -e . --group dev
     - name: Test with pytest
       run: |
         pytest tests/ --cov=src/ --cov-report=term-missing
@@ -35,14 +35,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python 3.8
+      - name: Set up Python 3.10
         uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: "3.10"
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install -e .[testing,type_checking]
+          python -m pip install -e . --group dev
       - name: Check type stub files
         run: |
           python -m mypy.stubtest ducktools.classbuilder

{ducktools_classbuilder-0.9.0 → ducktools_classbuilder-0.10.0}/.github/workflows/publish_to_pypi.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: "3.8"
+        python-version: "3.10"
     - name: Install pypa/build
       run: >-
         python3 -m
@@ -69,7 +69,7 @@ jobs:
         name: python-package-distributions
         path: dist/
     - name: Sign the dists with Sigstore
-      uses: sigstore/gh-action-sigstore-python@v3.0.0
+      uses: sigstore/gh-action-sigstore-python@v3.0.1
       with:
         release-signing-artifacts: false
         inputs: >-

{ducktools_classbuilder-0.9.0 → ducktools_classbuilder-0.10.0}/.github/workflows/publish_to_testpypi.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: "3.8"
+        python-version: "3.10"
     - name: Install pypa/build
       run: >-
         python3 -m
@@ -52,4 +52,4 @@ jobs:
     - name: Publish distribution 📦 to TestPyPI
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
-        repository-url: https://test.pypi.org/legacy/
+        repository-url: https://test.pypi.org/legacy/

{ducktools_classbuilder-0.9.0 → ducktools_classbuilder-0.10.0}/PKG-INFO

@@ -1,34 +1,25 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ducktools-classbuilder
-Version: 0.9.0
+Version: 0.10.0
 Summary: Toolkit for creating class boilerplate generators
 Author: David C Ellis
 Project-URL: Homepage, https://github.com/davidcellis/ducktools-classbuilder
 Classifier: Development Status :: 4 - Beta
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: MIT License
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Provides-Extra: testing
-Requires-Dist: pytest>=8.2; extra == "testing"
-Requires-Dist: pytest-cov; extra == "testing"
-Requires-Dist: typing_extensions; extra == "testing"
-Provides-Extra: type-checking
-Requires-Dist: mypy; extra == "type-checking"
-Provides-Extra: performance-tests
-Requires-Dist: attrs; extra == "performance-tests"
-Requires-Dist: pydantic; extra == "performance-tests"
 Provides-Extra: docs
-Requires-Dist: sphinx; extra == "docs"
-Requires-Dist: myst-parser; extra == "docs"
-Requires-Dist: sphinx_rtd_theme; extra == "docs"
+Requires-Dist: sphinx>=8.1; extra == "docs"
+Requires-Dist: myst-parser>=4.0; extra == "docs"
+Requires-Dist: sphinx_rtd_theme>=3.0; extra == "docs"
+Dynamic: license-file
 
 # Ducktools: Class Builder #
 

{ducktools_classbuilder-0.9.0 → ducktools_classbuilder-0.10.0}/docs/tutorial.md

@@ -191,14 +191,13 @@ def reportclass(cls):
 slot_gatherer = dtbuild.make_slot_gatherer(CustomField)
 
 
-class ReportClass(metaclass=dtbuild.SlotMakerMeta):
+class ReportClass(metaclass=dtbuild.SlotMakerMeta, gatherer=fields_attribute_gatherer):
     __slots__ = {}
-    _meta_gatherer = fields_attribute_gatherer
-
+    
     def __init_subclass__(cls):
-        # Check if the metaclass has generated slots
-        meta_slotted = '__slots__' in vars(cls) and isinstance(cls.__slots__, dtbuild.SlotFields)
-        gatherer = slot_gatherer if meta_slotted else fields_attribute_gatherer
+        # Check if the metaclass has pre-gathered data
+        pre_gathered = dtbuild.GATHERED_DATA in vars(cls)
+        gatherer = dtbuild.pre_gathered_gatherer if pre_gathered else fields_attribute_gatherer
         methods = {
             dtbuild.eq_maker,
             dtbuild.repr_maker,

{ducktools_classbuilder-0.9.0 → ducktools_classbuilder-0.10.0}/docs_code/docs_ex9_annotated.py

@@ -6,9 +6,10 @@ from ducktools.classbuilder import (
     default_methods,
     get_fields,
     get_methods,
-    slot_gatherer,
+    pre_gathered_gatherer,
     Field,
     SlotMakerMeta,
+    GATHERED_DATA,
     NOTHING,
 )
 
@@ -110,16 +111,15 @@ def annotatedclass(cls=None, *, kw_only=False):
 
 
 # As a base class with slots
-class AnnotatedClass(metaclass=SlotMakerMeta):
-    # This attribute tells the slotmaker to use this gatherer
-    _meta_gatherer = annotated_gatherer
-
+class AnnotatedClass(metaclass=SlotMakerMeta, gatherer=annotated_gatherer):
+    
     def __init_subclass__(cls, kw_only=False, **kwargs):
+        pre_gathered = GATHERED_DATA in cls.__dict__
         slots = "__slots__" in cls.__dict__
 
         # if slots is True then fields will already be present in __slots__
         # Use the slot_gatherer for this case
-        gatherer = slot_gatherer if slots else annotated_gatherer
+        gatherer = pre_gathered_gatherer if pre_gathered else annotated_gatherer
 
         builder(
             cls,
@@ -139,10 +139,10 @@ if __name__ == "__main__":
     class X:
         x: str
         y: ClassVar[str] = "This should be ignored"
-        z: Annotated[ClassVar[str], "Should be ignored"] = "This should also be ignored"
-        a: Annotated[int, NO_INIT] = "Not In __init__ signature"
+        z: Annotated[ClassVar[str], "Should be ignored"] = "This should also be ignored"  # type: ignore
+        a: Annotated[int, NO_INIT] = "Not In __init__ signature"  # type: ignore
         b: Annotated[str, NO_REPR] = "Not In Repr"
-        c: Annotated[list[str], NO_COMPARE] = Field(default_factory=list)
+        c: Annotated[list[str], NO_COMPARE] = Field(default_factory=list)  # type: ignore
         d: Annotated[str, IGNORE_ALL] = "Not Anywhere"
         e: Annotated[str, KW_ONLY, NO_COMPARE]
 
@@ -150,23 +150,23 @@ if __name__ == "__main__":
     class Y(AnnotatedClass):
         x: str
         y: ClassVar[str] = "This should be ignored"
-        z: Annotated[ClassVar[str], "Should be ignored"] = "This should also be ignored"
-        a: Annotated[int, NO_INIT] = "Not In __init__ signature"
+        z: Annotated[ClassVar[str], "Should be ignored"] = "This should also be ignored"  # type: ignore
+        a: Annotated[int, NO_INIT] = "Not In __init__ signature"  # type: ignore
         b: Annotated[str, NO_REPR] = "Not In Repr"
-        c: Annotated[list[str], NO_COMPARE] = Field(default_factory=list)
+        c: Annotated[list[str], NO_COMPARE] = Field(default_factory=list)  # type: ignore
         d: Annotated[str, IGNORE_ALL] = "Not Anywhere"
         e: Annotated[str, KW_ONLY, NO_COMPARE]
 
 
     # Unslotted Demo
-    ex = X("Value of x", e="Value of e")
+    ex = X("Value of x", e="Value of e")  # type: ignore
     print(ex, "\n")
 
     pp(get_fields(X))
     print("\n")
 
     # Slotted Demo
-    ex = Y("Value of x", e="Value of e")
+    ex = Y("Value of x", e="Value of e")  # type: ignore
     print(ex, "\n")
 
     print(f"Slots: {Y.__dict__.get('__slots__')}")

{ducktools_classbuilder-0.9.0 → ducktools_classbuilder-0.10.0}/docs_code/tutorial_code.py

@@ -115,14 +115,13 @@ def reportclass(cls):
 slot_gatherer = dtbuild.make_slot_gatherer(CustomField)
 
 
-class ReportClass(metaclass=dtbuild.SlotMakerMeta):
+class ReportClass(metaclass=dtbuild.SlotMakerMeta, gatherer=fields_attribute_gatherer):
     __slots__ = {}
-    _meta_gatherer = fields_attribute_gatherer
-
+    
     def __init_subclass__(cls):
-        # Check if the metaclass has generated slots
-        meta_slotted = '__slots__' in vars(cls) and isinstance(cls.__slots__, dtbuild.SlotFields)
-        gatherer = slot_gatherer if meta_slotted else fields_attribute_gatherer
+        # Check if the metaclass has pre-gathered data
+        pre_gathered = dtbuild.GATHERED_DATA in vars(cls)
+        gatherer = dtbuild.pre_gathered_gatherer if pre_gathered else fields_attribute_gatherer
         methods = {
             dtbuild.eq_maker,
             dtbuild.repr_maker,
@@ -130,7 +129,6 @@ class ReportClass(metaclass=dtbuild.SlotMakerMeta):
             report_maker
         }
 
-        # The class may still have slots unrelated to code generation
         slotted = "__slots__" in vars(cls)
         flags = {"slotted": slotted}
 

{ducktools_classbuilder-0.9.0 → ducktools_classbuilder-0.10.0}/pyproject.toml

@@ -12,32 +12,47 @@ authors = [
   { name="David C Ellis" },
 ]
 readme="README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 classifiers = [
     "Development Status :: 4 - Beta",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Operating System :: OS Independent",
     "License :: OSI Approved :: MIT License",
 ]
 dynamic = ['version']
 
 [project.optional-dependencies]
-testing = ["pytest>=8.2", "pytest-cov", "typing_extensions"]
-type_checking = ["mypy"]
-performance_tests = ["attrs", "pydantic"]
-docs = ["sphinx", "myst-parser", "sphinx_rtd_theme"]
+# Needed for the current readthedocs.yaml
+docs = [
+    "sphinx>=8.1", 
+    "myst-parser>=4.0", 
+    "sphinx_rtd_theme>=3.0",
+]
+
+[dependency-groups]
+dev = [
+    "pytest>=8.4",
+    "pytest-cov>=6.1",
+    "mypy>=1.16",
+]
+performance = [
+    "attrs>=25.0",
+    "pydantic>=2.11",
+]
 
 [tool.setuptools.packages.find]
 where = ["src"]
 
 [tool.setuptools_scm]
 version_file = "src/ducktools/classbuilder/_version.py"
-version_file_template = "__version__ = \"{version}\"\n__version_tuple__ = {version_tuple}\n"
+version_file_template = """
+__version__ = "{version}"
+__version_tuple__ = {version_tuple}
+"""
 
 [project.urls]
 "Homepage" = "https://github.com/davidcellis/ducktools-classbuilder"
@@ -47,3 +62,8 @@ addopts= "--cov=src/ --cov-report=term-missing"
 testpaths = [
     "tests",
 ]
+
+[tool.mypy]
+# A combination of types in stubs and tests using dataclass syntax
+# means that there are a number of annotations in otherwise unannotated areas
+disable_error_code = ["annotation-unchecked"]