Fix optional validator to accept tuples of len > 1 (#1496)

* Fix `optional` validator to accept tuples of len > 1

* Add changelog

* Add `optional` validator over 2-tuple test case to `baseline.py`

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Work around `ty` false positive `invalid-argument-type`

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Revert "fixes" from pre-commit.com hooks [skip pre-commit.ci]

This reverts commit 5b41382.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Silence ty

ref astral-sh/ty#3016

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Hynek Schlawack <hs@ox.cx>

Author: 3 people

changelog.d/1496.change.md

@@ -0,0 +1 @@
+Fix type annotations for `attrs.validators.optional()`, so it no longer rejects tuples with more than one validator.

src/attr/validators.pyi

@@ -54,7 +54,7 @@ def optional(
     validator: (
         _ValidatorType[_T]
         | list[_ValidatorType[_T]]
-        | tuple[_ValidatorType[_T]]
+        | tuple[_ValidatorType[_T], ...]
     ),
 ) -> _ValidatorType[_T | None]: ...
 def in_(options: Container[_T]) -> _ValidatorType[_T]: ...

typing-examples/baseline.py

@@ -94,6 +94,15 @@ class Validated:
     num: int = attrs.field(validator=attrs.validators.ge(0))
 
 
+@attrs.define
+class ValidatedOptionalOverTuple:
+    num: int | None = attrs.field(
+        validator=attrs.validators.optional(
+            (attrs.validators.instance_of(int), attrs.validators.ge(0))  # ty:ignore [invalid-argument-type]
+        )
+    )
+
+
 @attrs.define
 class ValidatedInconsistentOr:
     num: int | str = attrs.field(