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

{pydantic_marshmallow-1.0.0 → 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.0 → 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.0 → 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.1.0/.github/workflows/ci.yml

@@ -0,0 +1,210 @@
+name: CI
+
+on:
+  push:
+    branches: [main, develop]
+  pull_request:
+    branches: [main]
+
+permissions:
+  contents: read
+
+jobs:
+  lint:
+    name: Lint & Type Check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - name: Set up Python
+        run: uv python install 3.11
+
+      - name: Install dependencies
+        run: uv sync --all-extras
+
+      - name: Lint with ruff
+        run: uv run ruff check src/pydantic_marshmallow/ tests/
+
+      - name: Type check with mypy
+        run: uv run mypy src/pydantic_marshmallow/
+
+  test:
+    name: Test (Py${{ matrix.python-version }}, ${{ matrix.os }}, MA${{ matrix.marshmallow-version }}, PD${{ matrix.pydantic-version }})
+    needs: [lint]  # Only run tests after lint passes
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
+        marshmallow-version: ['latest']  # Default to latest Marshmallow (3.x from lock)
+        pydantic-version: ['latest']  # Default to latest Pydantic
+        include:
+          # === BASE VERSIONS (minimum supported) ===
+          # Marshmallow 3.18.0 + Pydantic 2.0.0 - minimum supported combo
+          - os: ubuntu-latest
+            python-version: '3.10'
+            marshmallow-version: '3.18.0'
+            pydantic-version: '2.0.0'
+          # Pydantic 2.0.0 with latest Marshmallow 3.x
+          - os: ubuntu-latest
+            python-version: '3.11'
+            marshmallow-version: 'latest'
+            pydantic-version: '2.0.0'
+
+          # === INTERMEDIATE VERSIONS ===
+          # Marshmallow 3.21.0 (last 3.x before 4.0) + Pydantic 2.5.x
+          - os: ubuntu-latest
+            python-version: '3.11'
+            marshmallow-version: '3.21.0'
+            pydantic-version: '2.5'
+          # Pydantic 2.5 (significant validation changes) with latest Marshmallow
+          - os: ubuntu-latest
+            python-version: '3.12'
+            marshmallow-version: 'latest'
+            pydantic-version: '2.5'
+
+          # === LATEST/BLEEDING EDGE ===
+          # Marshmallow 4.x latest on Ubuntu with Python 3.11 and 3.12
+          - os: ubuntu-latest
+            python-version: '3.11'
+            marshmallow-version: '4-latest'
+            pydantic-version: 'latest'
+          - os: ubuntu-latest
+            python-version: '3.12'
+            marshmallow-version: '4-latest'
+            pydantic-version: 'latest'
+          # Marshmallow 4.x + Pydantic 2.5 cross-version
+          - os: ubuntu-latest
+            python-version: '3.11'
+            marshmallow-version: '4-latest'
+            pydantic-version: '2.5'
+        exclude:
+          # Reduce matrix size - test all Python versions on Ubuntu, latest on others
+          - os: windows-latest
+            python-version: '3.10'
+          - os: windows-latest
+            python-version: '3.13'
+          - os: windows-latest
+            python-version: '3.14'
+          - os: macos-latest
+            python-version: '3.10'
+          - os: macos-latest
+            python-version: '3.13'
+          - os: macos-latest
+            python-version: '3.14'
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - name: Set up Python ${{ matrix.python-version }}
+        run: uv python install ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: uv sync --all-extras
+
+      - name: Override Marshmallow to 4.x latest
+        if: matrix.marshmallow-version == '4-latest'
+        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 add --dev "marshmallow==${{ matrix.marshmallow-version }}"
+
+      - name: Override Pydantic to 2.5.x
+        if: matrix.pydantic-version == '2.5'
+        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 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
+
+  coverage:
+    name: Coverage
+    needs: [lint]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Fetch all history for diff-cover
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - name: Set up Python
+        run: uv python install 3.11
+
+      - name: Install dependencies
+        run: uv sync --all-extras
+
+      - name: Run tests with coverage
+        run: |
+          uv run pytest tests/ --cov=src/pydantic_marshmallow --cov-report=xml --cov-report=term
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          files: ./coverage.xml
+          fail_ci_if_error: false  # Don't fail if Codecov is down
+          verbose: true
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+      - name: Check diff coverage (changed lines)
+        run: |
+          uv run diff-cover coverage.xml --compare-branch=origin/main --fail-under=80
+        continue-on-error: true  # Warn but don't fail initially
+
+  # This job is used as the required status check for branch protection
+  # Configure GitHub: Settings > Branches > Branch protection > Require "CI Passed"
+  ci-passed:
+    name: CI Passed
+    runs-on: ubuntu-latest
+    needs: [lint, test, coverage]
+    if: always()
+    steps:
+      - name: Check all jobs passed
+        run: |
+          if [[ "${{ needs.lint.result }}" != "success" ]]; then
+            echo "❌ Lint job failed"
+            exit 1
+          fi
+          if [[ "${{ needs.test.result }}" != "success" ]]; then
+            echo "❌ Test job failed"
+            exit 1
+          fi
+          if [[ "${{ needs.coverage.result }}" != "success" ]]; then
+            echo "❌ Coverage job failed"
+            exit 1
+          fi
+          echo "✅ All CI checks passed!"

{pydantic_marshmallow-1.0.0 → pydantic_marshmallow-1.1.0}/.github/workflows/release.yml

@@ -1,9 +1,6 @@
 name: Release
 
 on:
-  push:
-    branches:
-      - main
   workflow_dispatch:
     inputs:
       dry_run:
@@ -39,7 +36,7 @@ jobs:
         id: semantic
         uses: cycjimmy/semantic-release-action@v4
         with:
-          dry_run: ${{ inputs.dry_run || false }}
+          dry_run: ${{ inputs.dry_run }}
           extra_plugins: |
             conventional-changelog-conventionalcommits
         env:
@@ -48,7 +45,7 @@ jobs:
   build:
     name: Build Package
     needs: release
-    if: needs.release.outputs.new_release_published == 'true' && (inputs.dry_run == false || inputs.dry_run == null)
+    if: needs.release.outputs.new_release_published == 'true' && inputs.dry_run == false
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -72,7 +69,7 @@ jobs:
   publish:
     name: Publish to PyPI
     needs: [release, build]
-    if: needs.release.outputs.new_release_published == 'true' && (inputs.dry_run == false || inputs.dry_run == null)
+    if: needs.release.outputs.new_release_published == 'true' && inputs.dry_run == false
     runs-on: ubuntu-latest
     environment: pypi  # Requires approval if configured in GitHub Settings
     permissions:

{pydantic_marshmallow-1.0.0 → 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.1.0/.vscode/settings.json

@@ -0,0 +1,40 @@
+{
+    "python.analysis.extraPaths": [
+        "src"
+    ],
+    "python.analysis.include": [
+        "src/**/*.py"
+    ],
+    "python.analysis.exclude": [
+        "tests/**",
+        "benchmarks/**",
+        "examples/**",
+        "**/__pycache__/**",
+        ".venv/**"
+    ],
+    "python.analysis.ignore": [
+        "tests/**",
+        "benchmarks/**",
+        "examples/**"
+    ],
+    "python.analysis.diagnosticMode": "workspace",
+    "mypy-type-checker.args": [
+        "src/pydantic_marshmallow"
+    ],
+    "flake8.args": [
+        "src/pydantic_marshmallow"
+    ],
+    "[python]": {
+        "editor.defaultFormatter": "charliermarsh.ruff",
+        "editor.formatOnSave": true,
+        "editor.codeActionsOnSave": {
+            "source.organizeImports": "explicit",
+            "source.fixAll.autopep8": "never",
+            "source.fixAll.ruff": "explicit"
+        }
+    },
+    "autopep8.enable": false,
+    "python.formatting.provider": "none",
+    "ruff.format.args": [],
+    "ruff.organizeImports": true
+}

{pydantic_marshmallow-1.0.0 → 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