Merge branch 'dev' into add-trace-to-path-keys

Author: lafrech

.github/workflows/build-release.yml

@@ -22,21 +22,21 @@ jobs:
           - { name: "lowest", tox: py310-lowest }
           - { name: "3.14-madev", tox: py314-marshmallowdev }
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
+      - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
         with: # zizmor: ignore[cache-poisoning] cache key is lockfile-derived
           enable-cache: true
       - run: uv run tox -e${{ matrix.tox }}
   build:
     name: Build package
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
+      - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
         with: # zizmor: ignore[cache-poisoning] cache key is lockfile-derived
           enable-cache: true
       - run: uv build
@@ -52,10 +52,10 @@ jobs:
     if: startsWith(github.ref, 'refs/tags')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
+      - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
         with: # zizmor: ignore[cache-poisoning] cache key is lockfile-derived
           enable-cache: true
       - run: uv run tox -e lint
@@ -76,4 +76,4 @@ jobs:
           name: python-package-distributions
           path: dist/
       - name: Publish distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # release/v1
+        uses: pypa/gh-action-pypi-publish@dc37677b2e1c63e2034f94d8a5b11f265b73ba33 # release/v1

.pre-commit-config.yaml

@@ -2,17 +2,17 @@ ci:
   autoupdate_schedule: monthly
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.15.15
+  rev: v0.16.6
   hooks:
     - id: ruff
     - id: ruff-format
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.37.2
+  rev: 0.38.0
   hooks:
     - id: check-github-workflows
     - id: check-readthedocs
 - repo: https://github.com/zizmorcore/zizmor-pre-commit
-  rev: v1.25.2
+  rev: v1.30.0
   hooks:
     - id: zizmor
 - repo: https://github.com/asottile/blacken-docs
@@ -21,11 +21,11 @@ repos:
   - id: blacken-docs
     additional_dependencies: [black==24.10.0]
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v2.1.0
+  rev: v2.3.1
   hooks:
   - id: mypy
     additional_dependencies: ["marshmallow>=3.24.1,<5", "types-PyYAML"]
 - repo: https://github.com/astral-sh/uv-pre-commit
-  rev: 0.11.17
+  rev: 0.12.10
   hooks:
     - id: uv-lock

AUTHORS.rst

@@ -91,3 +91,4 @@ Contributors (chronological)
 - Felix Claessen `@Flix6x <https://github.com/Flix6x>`_
 - Karthik Ramadugu `@karthiksai109 <https://github.com/karthiksai109>`_
 - Amir Kahriman `@kingdomOfIT <https://github.com/kingdomOfIT>`_
+- Alex Chen `@alexchen-sys <https://github.com/alexchen-sys>`_

CHANGELOG.rst

@@ -8,6 +8,9 @@ Bug fixes:
 
 - Recognize ``trace`` operations defined in view docstrings, instead of
   silently dropping them (:pr:`1059`).
+  Thanks :user:`binggao1230` for the PR.
+- Fix intersect ``OneOf`` and ``Equal`` choices in ``field2choices`` (:issue:`198`).
+  Thanks :user:`alexchen-sys` for the PR.
 
 Other changes:
 
@@ -123,7 +126,7 @@ Other changes:
 
 Bug fixes:
 
-- ``MarshmallowPlugin``: Fix handling of ``Nested`` fields with 
+- ``MarshmallowPlugin``: Fix handling of ``Nested`` fields with
   ``allow_none=True`` (:issue:`833`). Thanks :user:`jc-harrison`
   for reporting and :user:`kolditz-senec` for the PR.
 

pyproject.toml

@@ -60,7 +60,7 @@ default-groups = ["dev"]
 exclude-newer = "1 week"
 
 [build-system]
-requires = ["flit_core<4"]
+requires = ["flit_core<5"]
 build-backend = "flit_core.buildapi"
 
 [tool.flit.sdist]

src/apispec/ext/marshmallow/field_converter.py

@@ -242,21 +242,14 @@ def field2choices(
         """
         attributes = {}
 
-        comparable = [
-            validator.comparable
-            for validator in field.validators
-            if hasattr(validator, "comparable")
-        ]
-        if comparable:
-            attributes["enum"] = comparable
-        else:
-            choices = [
-                OrderedSet(validator.choices)
-                for validator in field.validators
-                if hasattr(validator, "choices")
-            ]
-            if choices:
-                attributes["enum"] = list(functools.reduce(operator.and_, choices))
+        choices = []
+        for validator in field.validators:
+            if hasattr(validator, "choices"):
+                choices.append(OrderedSet(validator.choices))
+            elif hasattr(validator, "comparable"):
+                choices.append(OrderedSet([validator.comparable]))
+        if choices:
+            attributes["enum"] = list(functools.reduce(operator.and_, choices))
 
         if field.allow_none:
             enum = attributes.get("enum")

tests/test_ext_marshmallow_field.py

@@ -190,15 +190,79 @@ def test_only_allows_valid_properties_in_metadata(spec_fixture):
     assert "not_valid" not in res
 
 
-def test_field_with_choices_multiple(spec_fixture):
-    field = fields.Str(
-        validate=[
-            validate.OneOf(["freddie", "brian", "john"]),
-            validate.OneOf(["brian", "john", "roger"]),
-        ]
-    )
+@pytest.mark.parametrize(
+    ("validators", "expected_enum"),
+    [
+        (
+            [
+                validate.OneOf(["freddie", "brian", "john"]),
+                validate.OneOf(["brian", "john", "roger"]),
+            ],
+            {"brian", "john"},
+        ),
+        (
+            [
+                validate.OneOf(["freddie", "brian"]),
+                validate.OneOf(["john", "roger"]),
+            ],
+            set(),
+        ),
+    ],
+)
+def test_field_with_multiple_oneof(spec_fixture, validators, expected_enum):
+    field = fields.Str(validate=validators)
+    res = spec_fixture.openapi.field2property(field)
+    assert set(res["enum"]) == expected_enum
+
+
+@pytest.mark.parametrize(
+    ("validators", "expected_enum"),
+    [
+        (
+            [
+                validate.Equal("brian"),
+                validate.Equal("brian"),
+            ],
+            {"brian"},
+        ),
+        (
+            [
+                validate.Equal("freddie"),
+                validate.Equal("brian"),
+            ],
+            set(),
+        ),
+    ],
+)
+def test_field_with_multiple_equal(spec_fixture, validators, expected_enum):
+    field = fields.Str(validate=validators)
+    res = spec_fixture.openapi.field2property(field)
+    assert set(res["enum"]) == expected_enum
+
+
+@pytest.mark.parametrize(
+    ("validators", "expected_enum"),
+    [
+        (
+            [
+                validate.OneOf(["freddie", "brian", "john"]),
+                validate.Equal("brian"),
+            ],
+            {"brian"},
+        ),
+        (
+            [
+                validate.OneOf(["freddie", "brian"]),
+                validate.Equal("john"),
+            ],
+            set(),
+        ),
+    ],
+)
+def test_field_with_oneof_and_equal(spec_fixture, validators, expected_enum):
+    field = fields.Str(validate=validators)
     res = spec_fixture.openapi.field2property(field)
-    assert set(res["enum"]) == {"brian", "john"}
+    assert set(res["enum"]) == expected_enum
 
 
 def test_field_with_additional_metadata(spec_fixture):