Merge pull request #202 from pallets/release-2.0.0rc2

Release 2.0.0rc2

.pre-commit-config.yaml

@@ -14,13 +14,13 @@ repos:
     hooks:
       - id: black
   - repo: https://github.com/PyCQA/flake8
-    rev: 3.9.0
+    rev: 3.9.1
     hooks:
       - id: flake8
         additional_dependencies: [flake8-bugbear]
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v3.4.0
     hooks:
-      - id: check-byte-order-marker
+      - id: fix-byte-order-marker
       - id: trailing-whitespace
       - id: end-of-file-fixer

docs/conf.py

@@ -18,6 +18,7 @@
     "sphinxcontrib.log_cabinet",
     "sphinx_issues",
 ]
+autodoc_typehints = "description"
 intersphinx_mapping = {"python": ("https://docs.python.org/3/", None)}
 issues_github_path = "pallets/markupsafe"
 

requirements/dev.txt

@@ -28,7 +28,7 @@ filelock==3.0.12
     # via
     #   tox
     #   virtualenv
-identify==1.5.13
+identify==2.2.3
     # via pre-commit
 idna==2.10
     # via requests
@@ -43,35 +43,37 @@ markupsafe==1.1.1
 mypy-extensions==0.4.3
     # via mypy
 mypy==0.812
-    # via -r typing.in
-nodeenv==1.5.0
+    # via -r requirements/typing.in
+nodeenv==1.6.0
     # via pre-commit
 packaging==20.9
     # via
     #   pallets-sphinx-themes
     #   pytest
     #   sphinx
     #   tox
-pallets-sphinx-themes==1.2.3
-    # via -r docs.in
-pip-tools==5.5.0
-    # via -r dev.in
+pallets-sphinx-themes==2.0.0rc1
+    # via -r requirements/docs.in
+pep517==0.10.0
+    # via pip-tools
+pip-tools==6.1.0
+    # via -r requirements/dev.in
 pluggy==0.13.1
     # via
     #   pytest
     #   tox
-pre-commit==2.10.1
-    # via -r dev.in
+pre-commit==2.12.0
+    # via -r requirements/dev.in
 py==1.10.0
     # via
     #   pytest
     #   tox
-pygments==2.7.4
+pygments==2.8.1
     # via sphinx
 pyparsing==2.4.7
     # via packaging
-pytest==6.2.2
-    # via -r tests.in
+pytest==6.2.3
+    # via -r requirements/tests.in
 pytz==2021.1
     # via babel
 pyyaml==5.4.1
@@ -85,10 +87,10 @@ six==1.15.0
 snowballstemmer==2.1.0
     # via sphinx
 sphinx-issues==1.2.0
-    # via -r docs.in
-sphinx==3.5.1
+    # via -r requirements/docs.in
+sphinx==3.5.4
     # via
-    #   -r docs.in
+    #   -r requirements/docs.in
     #   pallets-sphinx-themes
     #   sphinx-issues
     #   sphinxcontrib-log-cabinet
@@ -101,25 +103,26 @@ sphinxcontrib-htmlhelp==1.0.3
 sphinxcontrib-jsmath==1.0.1
     # via sphinx
 sphinxcontrib-log-cabinet==1.0.1
-    # via -r docs.in
+    # via -r requirements/docs.in
 sphinxcontrib-qthelp==1.0.3
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.4
     # via sphinx
 toml==0.10.2
     # via
+    #   pep517
     #   pre-commit
     #   pytest
     #   tox
-tox==3.22.0
-    # via -r dev.in
-typed-ast==1.4.2
+tox==3.23.0
+    # via -r requirements/dev.in
+typed-ast==1.4.3
     # via mypy
 typing-extensions==3.7.4.3
     # via mypy
 urllib3==1.26.4
     # via requests
-virtualenv==20.4.2
+virtualenv==20.4.3
     # via
     #   pre-commit
     #   tox

requirements/docs.in

@@ -1,4 +1,4 @@
-Pallets-Sphinx-Themes
+Pallets-Sphinx-Themes >= 2.0.0rc1
 Sphinx
 sphinx-issues
 sphinxcontrib-log-cabinet

requirements/docs.txt

@@ -26,9 +26,9 @@ packaging==20.9
     # via
     #   pallets-sphinx-themes
     #   sphinx
-pallets-sphinx-themes==1.2.3
-    # via -r docs.in
-pygments==2.7.4
+pallets-sphinx-themes==2.0.0rc1
+    # via -r requirements/docs.in
+pygments==2.8.1
     # via sphinx
 pyparsing==2.4.7
     # via packaging
@@ -39,10 +39,10 @@ requests==2.25.1
 snowballstemmer==2.1.0
     # via sphinx
 sphinx-issues==1.2.0
-    # via -r docs.in
-sphinx==3.5.1
+    # via -r requirements/docs.in
+sphinx==3.5.4
     # via
-    #   -r docs.in
+    #   -r requirements/docs.in
     #   pallets-sphinx-themes
     #   sphinx-issues
     #   sphinxcontrib-log-cabinet
@@ -55,7 +55,7 @@ sphinxcontrib-htmlhelp==1.0.3
 sphinxcontrib-jsmath==1.0.1
     # via sphinx
 sphinxcontrib-log-cabinet==1.0.1
-    # via -r docs.in
+    # via -r requirements/docs.in
 sphinxcontrib-qthelp==1.0.3
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.4

requirements/tests.txt

@@ -16,7 +16,7 @@ py==1.10.0
     # via pytest
 pyparsing==2.4.7
     # via packaging
-pytest==6.2.2
+pytest==6.2.3
     # via -r requirements/tests.in
 toml==0.10.2
     # via pytest

requirements/typing.txt

@@ -8,7 +8,7 @@ mypy-extensions==0.4.3
     # via mypy
 mypy==0.812
     # via -r requirements/typing.in
-typed-ast==1.4.2
+typed-ast==1.4.3
     # via mypy
 typing-extensions==3.7.4.3
     # via mypy

src/markupsafe/__init__.py

@@ -10,7 +10,7 @@ def __html__(self) -> str:
             pass
 
 
-__version__ = "2.0.0rc1"
+__version__ = "2.0.0rc2"
 
 _striptags_re = re.compile(r"(<!--.*?-->|<[^>]*>)")