wry 0.1.6.dev3__tar.gz → 0.1.8__tar.gz

{wry-0.1.6.dev3 → wry-0.1.8}/.github/workflows/ci-cd.yml

@@ -177,6 +177,14 @@ jobs:
           ./dist/*.tar.gz
           ./dist/*.whl
 
+    - name: Get previous tag
+      id: previous_tag
+      run: |
+        # Get the previous tag (excluding the current one)
+        PREVIOUS_TAG=$(git tag --sort=-version:refname | grep -v '${{ github.ref_name }}' | head -n 1)
+        echo "previous_tag=$PREVIOUS_TAG" >> $GITHUB_OUTPUT
+        echo "Previous tag: $PREVIOUS_TAG"
+
     - name: Extract release notes from CHANGELOG
       id: release_notes
       run: |
@@ -186,6 +194,14 @@ jobs:
         # Extract release notes and save to file
         python scripts/extract_release_notes.py '${{ github.ref_name }}' > release_notes.md
 
+        # Add comparison link if we have a previous tag
+        if [ -n "${{ steps.previous_tag.outputs.previous_tag }}" ]; then
+          echo "" >> release_notes.md
+          echo "---" >> release_notes.md
+          echo "" >> release_notes.md
+          echo "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.previous_tag.outputs.previous_tag }}...${{ github.ref_name }}" >> release_notes.md
+        fi
+
         # Read the content for the release body
         echo 'RELEASE_NOTES<<EOF' >> $GITHUB_ENV
         cat release_notes.md >> $GITHUB_ENV

{wry-0.1.6.dev3 → wry-0.1.8}/.pre-commit-config.yaml

@@ -28,13 +28,18 @@ repos:
         args: [--cov=wry, --cov-branch, --cov-report=xml, --cov-report=term-missing, --cov-fail-under=90]
         pass_filenames: false
         always_run: true
+
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.17.1
+    hooks:
       - id: mypy
-        name: mypy
-        entry: mypy
-        language: system
-        types: [python]
         args: [wry/]
         pass_filenames: false
+        additional_dependencies:
+          - pydantic>=2.9.2
+          - click>=8.0.0
+          - annotated-types>=0.6.0
+          - setuptools-scm>=8.0
 
 # Temporarily disabled - bandit has dependency issues in pre-commit
   # - repo: https://github.com/PyCQA/bandit

{wry-0.1.6.dev3 → wry-0.1.8}/CHANGELOG.md

@@ -7,6 +7,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.1.7] - 2025-09-09
+
+### Added
+
+- `generate_click_parameters` as a classmethod on `WryModel` and `AutoWryModel`
+  - Allows using `@MyModel.generate_click_parameters()` directly without imports
+  - Simplifies API and reduces import requirements in downstream projects
+
+## [0.1.6] - 2025-09-08
+
+### Added
+
+- GitHub releases now include commit comparison links to previous releases
+- Development versions now use `.devN` format and show as pre-releases on PyPI
+
+### Changed
+
+- Switched setuptools-scm from `post-release` to `guess-next-dev` version scheme
+- Development versions now appear as pre-releases instead of regular releases on PyPI
+
 ## [0.1.5] - 2025-09-08
 
 ### Fixed
@@ -115,7 +135,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial version as `drycli` package (before rename to `wry`)
 
-[Unreleased]: https://github.com/tahouse/wry/compare/v0.1.5...HEAD
+[Unreleased]: https://github.com/tahouse/wry/compare/v0.1.7...HEAD
+[0.1.7]: https://github.com/tahouse/wry/compare/v0.1.6...v0.1.7
+[0.1.6]: https://github.com/tahouse/wry/compare/v0.1.5...v0.1.6
 [0.1.5]: https://github.com/tahouse/wry/compare/v0.1.4...v0.1.5
 [0.1.4]: https://github.com/tahouse/wry/compare/v0.1.3...v0.1.4
 [0.1.3]: https://github.com/tahouse/wry/compare/v0.1.2...v0.1.3

{wry-0.1.6.dev3 → wry-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wry
-Version: 0.1.6.dev3
+Version: 0.1.8
 Summary: Why Repeat Yourself? - Define your CLI once with Pydantic models
 Author-email: Tyler House <26489166+tahouse@users.noreply.github.com>
 License: MIT
@@ -243,8 +243,6 @@ class QuickConfig(AutoWryModel):
     age: int = Field(default=30, ge=0, le=120)
     email: str = Field(description="Your email")
 
-    # No need for Annotated[..., AutoOption]!
-
 @click.command()
 @generate_click_parameters(QuickConfig)
 def quickstart(config: QuickConfig):

{wry-0.1.6.dev3 → wry-0.1.8}/README.md

@@ -197,8 +197,6 @@ class QuickConfig(AutoWryModel):
     age: int = Field(default=30, ge=0, le=120)
     email: str = Field(description="Your email")
 
-    # No need for Annotated[..., AutoOption]!
-
 @click.command()
 @generate_click_parameters(QuickConfig)
 def quickstart(config: QuickConfig):

wry-0.1.8/tests/unit/test_generate_click_classmethod.py

@@ -0,0 +1,47 @@
+"""Test generate_click_parameters as a classmethod."""
+
+import click
+from pydantic import Field
+
+from wry import AutoWryModel, WryModel, generate_click_parameters
+
+
+class TestGenerateClickClassmethod:
+    """Test the generate_click_parameters classmethod."""
+
+    def test_wry_model_has_classmethod(self):
+        """Test that WryModel has generate_click_parameters classmethod."""
+        assert hasattr(WryModel, "generate_click_parameters")
+        assert callable(WryModel.generate_click_parameters)
+
+    def test_auto_wry_model_has_classmethod(self):
+        """Test that AutoWryModel has generate_click_parameters classmethod."""
+        assert hasattr(AutoWryModel, "generate_click_parameters")
+        assert callable(AutoWryModel.generate_click_parameters)
+
+    def test_classmethod_returns_same_as_function(self):
+        """Test that classmethod returns same decorator as direct function call."""
+
+        class SimpleModel(WryModel):
+            value: int = Field(default=1)
+
+        # Get decorator from classmethod
+        classmethod_decorator = SimpleModel.generate_click_parameters()
+        # Get decorator from function
+        function_decorator = generate_click_parameters(SimpleModel)
+
+        # Both should be callables
+        assert callable(classmethod_decorator)
+        assert callable(function_decorator)
+
+        # They should have the same behavior (though not necessarily the same object)
+        # The important thing is that the classmethod works
+        @click.command()
+        @classmethod_decorator
+        def dummy(**kwargs):
+            pass
+
+        # Should have config and show_env_vars options added
+        param_names = [p.name for p in dummy.params]
+        assert "config" in param_names
+        assert "show_env_vars" in param_names

{wry-0.1.6.dev3 → wry-0.1.8}/wry/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.1.6.dev3'
-__version_tuple__ = version_tuple = (0, 1, 6, 'dev3')
+__version__ = version = '0.1.8'
+__version_tuple__ = version_tuple = (0, 1, 8)
 
-__commit_id__ = commit_id = 'gef20e4f4a'
+__commit_id__ = commit_id = 'g2ea5305d9'

{wry-0.1.6.dev3 → wry-0.1.8}/wry/click_integration.py

@@ -314,7 +314,7 @@ def generate_click_parameters(
     model_class: type[BaseModel],
     add_config_option: bool = True,
     strict: bool = True,
-) -> Callable[..., Any]:
+) -> Callable[[FC], FC]:
     """Generate Click options and arguments with smart auto-generation.
 
     This decorator automatically generates Click CLI parameters from a Pydantic
@@ -357,7 +357,11 @@ def generate_click_parameters(
                 field_type = AutoClickParameter.REQUIRED_OPTION
             elif item == AutoClickParameter.ARGUMENT:
                 field_type = AutoClickParameter.ARGUMENT
-            elif hasattr(item, "__module__") and "click" in str(item.__module__):
+            elif (
+                hasattr(item, "__module__")
+                and "click" in str(item.__module__)
+                and not isinstance(item, AutoClickParameter)
+            ):
                 click_parameter = item
                 break
 
@@ -504,7 +508,7 @@ def generate_click_parameters(
         )
     )
 
-    def decorator(func: Callable[[FC], FC]) -> Callable[[FC], FC]:
+    def decorator(func: FC) -> FC:
         # Check for duplicate decorator application
         if hasattr(func, "_wry_models"):
             existing_models = getattr(func, "_wry_models", [])

{wry-0.1.6.dev3 → wry-0.1.8}/wry/core/model.py

@@ -1,13 +1,17 @@
 """Core WryModel implementation."""
 
 import json
+from collections.abc import Callable
 from pathlib import Path
-from typing import Any, ClassVar, TypeVar
+from typing import TYPE_CHECKING, Any, ClassVar, TypeVar, cast
 
 import click
 from pydantic import BaseModel, ConfigDict
 from pydantic_core import PydanticUndefined
 
+if TYPE_CHECKING:
+    from click.decorators import FC
+
 from .accessors import (
     ConstraintsAccessor,
     DefaultsAccessor,
@@ -416,7 +420,10 @@ class WryModel(BaseModel):
                 if field_info.default is not PydanticUndefined:
                     config_data[field_name] = TrackedValue(field_info.default, ValueSource.DEFAULT)
                 elif field_info.default_factory is not None:
-                    config_data[field_name] = TrackedValue(field_info.default_factory(), ValueSource.DEFAULT)
+                    config_data[field_name] = TrackedValue(
+                        cast(Callable[[], Any], field_info.default_factory)(),
+                        ValueSource.DEFAULT,
+                    )
 
         return cls.create_with_sources(config_data)
 
@@ -495,7 +502,7 @@ class WryModel(BaseModel):
                 config_data[field_name] = TrackedValue(field_info.default, ValueSource.DEFAULT)
             elif field_info.default_factory is not None:
                 factory = field_info.default_factory
-                config_data[field_name] = TrackedValue(factory(), ValueSource.DEFAULT)
+                config_data[field_name] = TrackedValue(cast(Callable[[], Any], factory)(), ValueSource.DEFAULT)
 
         # 2. Override with environment values
         for field_name, value in env_values.items():
@@ -624,6 +631,29 @@ class WryModel(BaseModel):
                 if field_info.default is not PydanticUndefined:
                     result[field_name] = field_info.default
                 elif field_info.default_factory is not None:
-                    result[field_name] = field_info.default_factory()
+                    result[field_name] = cast(Callable[[], Any], field_info.default_factory)()
 
         return result
+
+    @classmethod
+    def generate_click_parameters(cls) -> "Callable[[FC], FC]":
+        """Generate Click parameters decorator for this model.
+
+        This is a convenience method that allows using the decorator
+        directly from the model class without needing to import it.
+
+        Example:
+            ```python
+            @click.command()
+            @MyConfig.generate_click_parameters()
+            @click.pass_context
+            def cli(ctx, **kwargs):
+                config = MyConfig.from_click_context(ctx, **kwargs)
+            ```
+
+        Returns:
+            The generate_click_parameters decorator configured for this model
+        """
+        from ..click_integration import generate_click_parameters
+
+        return generate_click_parameters(cls)

{wry-0.1.6.dev3 → wry-0.1.8}/wry.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wry
-Version: 0.1.6.dev3
+Version: 0.1.8
 Summary: Why Repeat Yourself? - Define your CLI once with Pydantic models
 Author-email: Tyler House <26489166+tahouse@users.noreply.github.com>
 License: MIT
@@ -243,8 +243,6 @@ class QuickConfig(AutoWryModel):
     age: int = Field(default=30, ge=0, le=120)
     email: str = Field(description="Your email")
 
-    # No need for Annotated[..., AutoOption]!
-
 @click.command()
 @generate_click_parameters(QuickConfig)
 def quickstart(config: QuickConfig):

{wry-0.1.6.dev3 → wry-0.1.8}/wry.egg-info/SOURCES.txt

@@ -33,6 +33,7 @@ tests/integration/test_context_handling.py
 tests/unit/__init__.py
 tests/unit/test_auto_model_field_processing.py
 tests/unit/test_comprehensive_imports.py
+tests/unit/test_generate_click_classmethod.py
 tests/unit/test_init.py
 tests/unit/test_init_edge_cases.py
 tests/unit/test_init_version_edge_cases.py