update signatures and annotations

CHANGES.rst

@@ -7,6 +7,9 @@ Unreleased
 -   Use modern packaging metadata with ``pyproject.toml`` instead of ``setup.cfg``.
     :pr:`348`
 -   Change ``distutils`` imports to ``setuptools``. :pr:`399`
+-   Use deferred evaluation of annotations. :pr:`400`
+-   Update signatures for ``Markup`` methods to match ``str`` signatures. Use
+    positional-only arguments. :pr:`400`
 
 
 Version 2.1.3

pyproject.toml

@@ -47,9 +47,12 @@ source = ["src", "*/site-packages"]
 
 [tool.mypy]
 python_version = "3.8"
-files = ["src/markupsafe"]
+files = ["src/markupsafe", "tests"]
 show_error_codes = true
 pretty = true
 strict = true
-local_partial_types = true
-warn_unreachable = true
+
+[tool.pyright]
+pythonVersion = "3.8"
+include = ["src/markupsafe", "tests"]
+typeCheckingMode = "basic"

requirements/dev.txt

@@ -30,8 +30,6 @@ filelock==3.12.3
     #   virtualenv
 identify==2.5.27
     # via pre-commit
-nodeenv==1.8.0
-    # via pre-commit
 pip-compile-multi==2.6.3
     # via -r requirements/dev.in
 pip-tools==7.3.0

requirements/typing.in

@@ -1 +1,3 @@
 mypy
+pyright
+pytest

requirements/typing.txt

@@ -1,13 +1,28 @@
-# SHA1:7983aaa01d64547827c20395d77e248c41b2572f
+# SHA1:56a0ce21228a30a3076f16291ca773ce48ffcb2c
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
 #
 #    pip-compile-multi
 #
+iniconfig==2.0.0
+    # via pytest
 mypy==1.5.1
     # via -r requirements/typing.in
 mypy-extensions==1.0.0
     # via mypy
+nodeenv==1.8.0
+    # via pyright
+packaging==23.1
+    # via pytest
+pluggy==1.3.0
+    # via pytest
+pyright==1.1.326
+    # via -r requirements/typing.in
+pytest==7.4.1
+    # via -r requirements/typing.in
 typing-extensions==4.7.1
     # via mypy
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools