pydantic-marshmallow 1.0.1__tar.gz → 1.1.0__tar.gz

{pydantic_marshmallow-1.0.1 → pydantic_marshmallow-1.1.0}/.github/instructions/Default.instructions.md

@@ -35,6 +35,7 @@ ruff format src/ tests/
 **Before committing:** Run `pytest tests/ -v && mypy src/ && ruff check src/ tests/`
 
 See [Git.instructions.md](Git.instructions.md) for full CI/CD workflow.
+See [Performance.instructions.md](Performance.instructions.md) for benchmark guidelines.
 
 ## Architecture
 
@@ -132,9 +133,34 @@ This ensures field filtering works correctly with dynamically generated fields.
 
 **Runtime:**
 - pydantic >= 2.0
-- marshmallow >= 3.18
+- marshmallow >= 3.18 (supports both 3.x and 4.x)
 
 **Development:**
 - pytest, pytest-cov
 - mypy
 - ruff
+
+## Marshmallow Version Compatibility
+
+The library supports both Marshmallow 3.x and 4.x. Key differences handled internally:
+- **MA 4.x**: `context` parameter removed from `Schema.__init__` (use `contextvars` instead)
+- **MA 4.x**: `@validates_schema(pass_many=True)` renamed to `pass_collection=True`
+- **MA 4.x**: `unknown` parameter required in internal processor methods
+
+**Testing both versions locally:**
+```bash
+# Create separate venvs
+python -m venv .venv-ma3
+python -m venv .venv-ma4
+
+# Install with specific versions
+.\.venv-ma3\Scripts\pip install -e ".[dev]" "marshmallow>=3.18,<4"
+.\.venv-ma4\Scripts\pip install -e ".[dev]" "marshmallow>=4" "flask-rebar>=3.4.0"
+
+# Run tests
+.\.venv-ma3\Scripts\python -m pytest tests/ -v
+.\.venv-ma4\Scripts\python -m pytest tests/ -v
+```
+
+**Ecosystem version requirements:**
+- flask-rebar ≥ 3.4.0 required for MA 4.x swagger generation support

{pydantic_marshmallow-1.0.1 → pydantic_marshmallow-1.1.0}/.github/instructions/Git.instructions.md

@@ -38,9 +38,9 @@ ruff check src/ tests/
 1. **Push changes** - Never merge uncommitted work
 2. **Wait for CI** - Check GitHub Actions status
 3. **All checks must pass**:
-   - Tests pass on Python 3.9, 3.10, 3.11, 3.12, 3.13, 3.14
+   - Tests pass on Python 3.10, 3.11, 3.12, 3.13, 3.14
    - mypy type checking passes
-   - ruff and flake8 linting passes
+   - ruff linting passes
 4. **Only merge after CI success** - The `ci-passed` job gates all merges
 
 ## Checking CI Status

{pydantic_marshmallow-1.0.1 → pydantic_marshmallow-1.1.0}/.github/instructions/Implementation.instructions.md

@@ -150,11 +150,22 @@ class BridgeValidationError(ValidationError):
 
 ### Benchmarking
 
+**See [Performance.instructions.md](Performance.instructions.md) for full guidelines.**
+
+**Critical:** Always verify dependency versions before benchmarking:
+```python
+# ALWAYS run this before any benchmark
+python -c "import marshmallow; print(marshmallow.__file__); from importlib.metadata import version; print('Version:', version('marshmallow'))"
+```
+
+Basic benchmark example:
 ```python
 # In benchmarks/
-from benchmark_framework import benchmark, compare_baseline
+from benchmark_framework import BenchmarkSuite
+
+suite = BenchmarkSuite("my_benchmarks", iterations=1000, runs=3)
 
-@benchmark(iterations=1000)
+@suite.add("bench_simple_load")
 def bench_simple_load():
     schema.load({"name": "test", "age": 30})
 ```

{pydantic_marshmallow-1.0.1 → pydantic_marshmallow-1.1.0}/.github/workflows/ci.yml

@@ -28,9 +28,6 @@ jobs:
       - name: Lint with ruff
         run: uv run ruff check src/pydantic_marshmallow/ tests/
 
-      - name: Lint with flake8
-        run: uv run flake8 src/pydantic_marshmallow/ tests/
-
       - name: Type check with mypy
         run: uv run mypy src/pydantic_marshmallow/
 
@@ -114,19 +111,40 @@ jobs:
 
       - name: Override Marshmallow to 4.x latest
         if: matrix.marshmallow-version == '4-latest'
-        run: uv pip install --upgrade "marshmallow>=4.0.0"
+        run: uv add --dev "marshmallow>=4.0.0"
+
+      - name: Upgrade flask-rebar for Marshmallow 4.x compatibility
+        if: matrix.marshmallow-version == '4-latest'
+        run: uv add --dev "flask-rebar>=3.4.0"
 
       - name: Override Marshmallow to specific version
         if: matrix.marshmallow-version != 'latest' && matrix.marshmallow-version != '4-latest'
-        run: uv pip install "marshmallow==${{ matrix.marshmallow-version }}"
+        run: uv add --dev "marshmallow==${{ matrix.marshmallow-version }}"
 
       - name: Override Pydantic to 2.5.x
         if: matrix.pydantic-version == '2.5'
-        run: uv pip install "pydantic>=2.5.0,<2.6.0"
+        run: uv add --dev "pydantic>=2.5.0,<2.6.0"
 
       - name: Override Pydantic to specific version
         if: matrix.pydantic-version == '2.0.0'
-        run: uv pip install "pydantic>=2.0.0,<2.1.0"
+        run: uv add --dev "pydantic>=2.0.0,<2.1.0"
+
+      - name: Verify installed versions
+        run: |
+          echo "=== Installed Versions ==="
+          uv run python -c "from importlib.metadata import version; print(f'Marshmallow: {version(\"marshmallow\")}')"
+          uv run python -c "from importlib.metadata import version; print(f'Pydantic: {version(\"pydantic\")}')"
+          uv run python -c "import sys; print(f'Python: {sys.version}')"
+
+      - name: Verify Marshmallow 4.x installed
+        if: matrix.marshmallow-version == '4-latest'
+        run: |
+          uv run python -c "from importlib.metadata import version; v = version('marshmallow'); assert v.startswith('4.'), f'Expected MA 4.x, got {v}'"
+
+      - name: Verify Marshmallow 3.x installed
+        if: matrix.marshmallow-version == '3.18.0' || matrix.marshmallow-version == '3.21.0'
+        run: |
+          uv run python -c "from importlib.metadata import version; v = version('marshmallow'); assert v == '${{ matrix.marshmallow-version }}', f'Expected MA ${{ matrix.marshmallow-version }}, got {v}'"
 
       - name: Run tests
         run: uv run pytest tests/ -v --tb=short

{pydantic_marshmallow-1.0.1 → pydantic_marshmallow-1.1.0}/.gitignore

@@ -141,6 +141,7 @@ celerybeat.pid
 env/
 venv/
 ENV/
+.venv-*/
 env.bak/
 venv.bak/
 
@@ -154,6 +155,9 @@ venv.bak/
 # mkdocs documentation
 /site
 
+# Docker (local dev only)
+docker/
+
 # mypy
 .mypy_cache/
 .dmypy.json

pydantic_marshmallow-1.1.0/.pre-commit-config.yaml

@@ -0,0 +1,55 @@
+# Pre-commit hooks for pydantic-marshmallow
+# Install: pre-commit install
+# Run all: pre-commit run --all-files
+# Update: pre-commit autoupdate
+
+default_language_version:
+  python: python3.11
+
+repos:
+  # Ruff - fast linter and formatter (replaces flake8, isort, black)
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.15.0
+    hooks:
+      - id: ruff
+        name: ruff (lint)
+        args: [--fix, --exit-non-zero-on-fix]
+      - id: ruff-format
+        name: ruff (format)
+
+  # Type checking with mypy
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.19.0
+    hooks:
+      - id: mypy
+        name: mypy
+        additional_dependencies:
+          - marshmallow>=3.18.0
+          - pydantic>=2.0.0
+          - typing-extensions>=4.0.0
+        args: [--config-file=pyproject.toml]
+        pass_filenames: false
+        files: ^src/
+
+  # Standard pre-commit hooks
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: trailing-whitespace
+        exclude: ^(site/|.*\.md)$
+      - id: end-of-file-fixer
+        exclude: ^site/
+      - id: check-yaml
+        args: [--unsafe]
+      - id: check-toml
+      - id: check-added-large-files
+        args: [--maxkb=500]
+      - id: check-merge-conflict
+      - id: debug-statements
+      - id: mixed-line-ending
+        args: [--fix=lf]
+        exclude: \.ps1$
+
+ci:
+  autoupdate_schedule: monthly
+  skip: [mypy]  # Skip mypy in CI (run separately with full deps)

pydantic_marshmallow-1.1.0/.releaserc.json

@@ -0,0 +1,107 @@
+{
+  "branches": [
+    "main"
+  ],
+  "plugins": [
+    [
+      "@semantic-release/commit-analyzer",
+      {
+        "preset": "conventionalcommits",
+        "releaseRules": [
+          {
+            "type": "feat",
+            "release": "minor"
+          },
+          {
+            "type": "fix",
+            "release": "patch"
+          },
+          {
+            "type": "perf",
+            "release": "patch"
+          },
+          {
+            "type": "docs",
+            "release": false
+          },
+          {
+            "type": "style",
+            "release": false
+          },
+          {
+            "type": "refactor",
+            "release": "patch"
+          },
+          {
+            "type": "test",
+            "release": false
+          },
+          {
+            "type": "ci",
+            "release": false
+          },
+          {
+            "type": "chore",
+            "release": false
+          },
+          {
+            "breaking": true,
+            "release": "major"
+          }
+        ]
+      }
+    ],
+    [
+      "@semantic-release/release-notes-generator",
+      {
+        "preset": "conventionalcommits",
+        "presetConfig": {
+          "types": [
+            {
+              "type": "feat",
+              "section": "Features"
+            },
+            {
+              "type": "fix",
+              "section": "Bug Fixes"
+            },
+            {
+              "type": "perf",
+              "section": "Performance"
+            },
+            {
+              "type": "refactor",
+              "section": "Refactoring"
+            },
+            {
+              "type": "docs",
+              "section": "Documentation",
+              "hidden": true
+            },
+            {
+              "type": "style",
+              "section": "Styles",
+              "hidden": true
+            },
+            {
+              "type": "test",
+              "section": "Tests",
+              "hidden": true
+            },
+            {
+              "type": "ci",
+              "section": "CI",
+              "hidden": true
+            },
+            {
+              "type": "chore",
+              "section": "Chores",
+              "hidden": true
+            }
+          ]
+        }
+      }
+    ],
+    "@semantic-release/github"
+  ]
+}

{pydantic_marshmallow-1.0.1 → pydantic_marshmallow-1.1.0}/CAPABILITY_MATRIX.md

@@ -3,8 +3,8 @@
 This document maps features from both libraries and tracks bridge support.
 
 **Last Updated**: February 2026  
-**Tested Versions**: Marshmallow 3.x, Pydantic 2.x  
-**Test Suite**: 375+ tests
+**Tested Versions**: Marshmallow 3.x/4.x, Pydantic 2.x  
+**Test Suite**: 515+ tests
 
 ## Legend
 - ✅ Fully supported and tested
@@ -296,19 +296,27 @@ This document maps features from both libraries and tracks bridge support.
 
 | Tool | Status | Notes |
 |:-----|:------:|:------|
-| Flask-Rebar | ✅ | Schema subclass |
+| Flask-Rebar | ✅ | Schema subclass; requires ≥3.4.0 for MA 4.x swagger |
 | webargs | ✅ | Schema subclass |
 | apispec | ✅ | Schema subclass |
 | Flask-Marshmallow | ✅ | Schema subclass |
 | Flask-Smorest | ✅ | Schema subclass |
 | marshmallow-sqlalchemy | ✅ | Works alongside |
 
+#### Flask-Rebar Version Notes
+- **flask-rebar ≥ 3.4.0**: Full support for Marshmallow 4.x including swagger generation
+- **flask-rebar < 3.4.0**: Works with Marshmallow 3.x; swagger generation fails on MA 4.x due to removed `ordered` attribute
+
 ---
 
 ## 4. Version Compatibility
 
 | pydantic-marshmallow | Marshmallow | Pydantic | Python |
 |:---------------------|:------------|:---------|:-------|
-| 0.1.x | 3.18+ | 2.0+ | 3.9-3.14 |
+| 0.1.x | 3.18+ / 4.x | 2.0+ | 3.10-3.14 |
+
+**Marshmallow Version Notes:**
+- **MA 3.x**: Full feature support including `context` parameter
+- **MA 4.x**: Full support; `context` parameter removed (use `contextvars` instead)
 
-**CI tests against:** Python 3.9, 3.10, 3.11, 3.12, 3.13, 3.14 on Ubuntu/Windows/macOS
+**CI tests against:** Python 3.10, 3.11, 3.12, 3.13, 3.14 on Ubuntu/Windows/macOS

{pydantic_marshmallow-1.0.1/src/pydantic_marshmallow.egg-info → pydantic_marshmallow-1.1.0}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: pydantic-marshmallow
-Version: 1.0.1
+Version: 1.1.0
 Summary: Bring Pydantic's power to Marshmallow: type annotations, validators, and automatic schema generation
-Author-email: Your Name <your.email@example.com>
+Author: Michael Thomas
 License: MIT
 Project-URL: Homepage, https://github.com/mockodin/pydantic-marshmallow
 Project-URL: Documentation, https://mockodin.github.io/pydantic-marshmallow
@@ -32,10 +32,9 @@ Provides-Extra: dev
 Requires-Dist: pytest>=8.0.0; extra == "dev"
 Requires-Dist: pytest-cov>=5.0.0; extra == "dev"
 Requires-Dist: email-validator>=2.1.0; extra == "dev"
-Requires-Dist: mypy>=1.10.0; extra == "dev"
-Requires-Dist: ruff>=0.4.0; extra == "dev"
-Requires-Dist: flake8>=7.1.0; extra == "dev"
-Requires-Dist: flake8-pyproject>=1.2.4; extra == "dev"
+Requires-Dist: mypy==1.19.1; extra == "dev"
+Requires-Dist: ruff==0.15.0; extra == "dev"
+Requires-Dist: pre-commit>=4.2.0; extra == "dev"
 Requires-Dist: sqlalchemy>=2.0.30; extra == "dev"
 Requires-Dist: marshmallow-sqlalchemy>=1.1.0; extra == "dev"
 Requires-Dist: flask>=3.0.0; extra == "dev"
@@ -73,16 +72,27 @@ Get the best of both worlds: **Pydantic's speed** with **Marshmallow's ecosystem
 
 ### Performance
 
-pydantic-marshmallow uses Pydantic's Rust-powered validation engine under the hood, delivering significant performance improvements over native Marshmallow—especially for nested data structures:
+pydantic-marshmallow uses Pydantic's Rust-powered validation engine under the hood, delivering significant performance improvements over native Marshmallow—especially for nested data structures.
 
-| Operation | pydantic-marshmallow | Marshmallow | Speedup |
-|-----------|---------------------|-------------|---------|
-| Simple load | 3.0 µs | 5.3 µs | **1.8x faster** |
-| Nested model | 3.5 µs | 11.6 µs | **3.3x faster** |
-| Deep nested (4 levels) | 5.6 µs | 32.3 µs | **5.8x faster** |
-| Batch (100 items) | 255 µs | 474 µs | **1.9x faster** |
+#### Performance Comparison
 
-*Benchmarks run on Python 3.11. Run `python -m benchmarks.run_benchmarks` to reproduce.*
+| Operation | MA 3.x | MA 4.x | Bridge (MA 3.x) | Bridge (MA 4.x) |
+|-----------|--------|--------|-----------------|-----------------|
+| Simple load | 5.3 µs | 4.8 µs | 2.9 µs | 2.9 µs |
+| Nested model | 10.9 µs | 10.5 µs | 3.4 µs | 3.2 µs |
+| Deep nested (4 levels) | 31.2 µs | 29.0 µs | 5.3 µs | 5.2 µs |
+| Batch (100 items) | 454 µs | 424 µs | 260 µs | 259 µs |
+
+#### What the Numbers Show
+
+1. **MA 3.x → MA 4.x**: Marshmallow 4.x improved ~10% over 3.x (5.3 → 4.8 µs for simple loads)
+2. **MA 3.x → Bridge**: Adding Pydantic delivers **1.8x–5.9x speedup** over pure MA 3.x
+3. **MA 4.x → Bridge**: Still **1.6x–5.6x faster** than native MA 4.x
+4. **Bridge consistency**: ~2.9 µs for simple loads regardless of Marshmallow version
+
+The bridge delegates validation to Pydantic's Rust-powered core, bypassing Marshmallow's field processing. This means bridge performance is **independent of Marshmallow version**—you get consistent speed whether you're on MA 3.x or 4.x.
+
+*Benchmarks: Python 3.11, median of 3 runs with IQR outlier removal. Run `python -m benchmarks.run_benchmarks` to reproduce.*
 
 ### Why it matters
 
@@ -107,6 +117,8 @@ pydantic-marshmallow uses Pydantic's Rust-powered validation engine under the ho
 pip install pydantic-marshmallow
 ```
 
+**Requirements:** Python 3.10+, Pydantic 2.0+, Marshmallow 3.18+ (including 4.x)
+
 ## Quick Start
 
 ### Basic Usage

{pydantic_marshmallow-1.0.1 → pydantic_marshmallow-1.1.0}/README.md

@@ -15,16 +15,27 @@ Get the best of both worlds: **Pydantic's speed** with **Marshmallow's ecosystem
 
 ### Performance
 
-pydantic-marshmallow uses Pydantic's Rust-powered validation engine under the hood, delivering significant performance improvements over native Marshmallow—especially for nested data structures:
+pydantic-marshmallow uses Pydantic's Rust-powered validation engine under the hood, delivering significant performance improvements over native Marshmallow—especially for nested data structures.
 
-| Operation | pydantic-marshmallow | Marshmallow | Speedup |
-|-----------|---------------------|-------------|---------|
-| Simple load | 3.0 µs | 5.3 µs | **1.8x faster** |
-| Nested model | 3.5 µs | 11.6 µs | **3.3x faster** |
-| Deep nested (4 levels) | 5.6 µs | 32.3 µs | **5.8x faster** |
-| Batch (100 items) | 255 µs | 474 µs | **1.9x faster** |
+#### Performance Comparison
 
-*Benchmarks run on Python 3.11. Run `python -m benchmarks.run_benchmarks` to reproduce.*
+| Operation | MA 3.x | MA 4.x | Bridge (MA 3.x) | Bridge (MA 4.x) |
+|-----------|--------|--------|-----------------|-----------------|
+| Simple load | 5.3 µs | 4.8 µs | 2.9 µs | 2.9 µs |
+| Nested model | 10.9 µs | 10.5 µs | 3.4 µs | 3.2 µs |
+| Deep nested (4 levels) | 31.2 µs | 29.0 µs | 5.3 µs | 5.2 µs |
+| Batch (100 items) | 454 µs | 424 µs | 260 µs | 259 µs |
+
+#### What the Numbers Show
+
+1. **MA 3.x → MA 4.x**: Marshmallow 4.x improved ~10% over 3.x (5.3 → 4.8 µs for simple loads)
+2. **MA 3.x → Bridge**: Adding Pydantic delivers **1.8x–5.9x speedup** over pure MA 3.x
+3. **MA 4.x → Bridge**: Still **1.6x–5.6x faster** than native MA 4.x
+4. **Bridge consistency**: ~2.9 µs for simple loads regardless of Marshmallow version
+
+The bridge delegates validation to Pydantic's Rust-powered core, bypassing Marshmallow's field processing. This means bridge performance is **independent of Marshmallow version**—you get consistent speed whether you're on MA 3.x or 4.x.
+
+*Benchmarks: Python 3.11, median of 3 runs with IQR outlier removal. Run `python -m benchmarks.run_benchmarks` to reproduce.*
 
 ### Why it matters
 
@@ -49,6 +60,8 @@ pydantic-marshmallow uses Pydantic's Rust-powered validation engine under the ho
 pip install pydantic-marshmallow
 ```
 
+**Requirements:** Python 3.10+, Pydantic 2.0+, Marshmallow 3.18+ (including 4.x)
+
 ## Quick Start
 
 ### Basic Usage

{pydantic_marshmallow-1.0.1 → pydantic_marshmallow-1.1.0}/benchmarks/__init__.py

@@ -13,6 +13,7 @@ from .benchmark_framework import (
     run_benchmark,
 )
 
+
 __all__ = [
     "BenchmarkResult",
     "BenchmarkSuite",