Skip to content

Commit

Permalink
Merge pull request #211 from pallets/release-2.0.0
Browse files Browse the repository at this point in the history
Release 2.0.0
  • Loading branch information
davidism authored May 11, 2021
2 parents 0228375 + 1521885 commit e7930ee
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 25 deletions.
2 changes: 1 addition & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Version 2.0.0
-------------

Unreleased
Released 2021-05-11

- Drop Python 2.7, 3.4, and 3.5 support.
- ``Markup.unescape`` uses :func:`html.unescape` to support HTML5
Expand Down
28 changes: 15 additions & 13 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ alabaster==0.7.12
# via sphinx
appdirs==1.4.4
# via virtualenv
attrs==20.3.0
attrs==21.2.0
# via pytest
babel==2.9.0
babel==2.9.1
# via sphinx
certifi==2020.12.5
# via requests
Expand All @@ -22,13 +22,13 @@ click==7.1.2
# via pip-tools
distlib==0.3.1
# via virtualenv
docutils==0.16
docutils==0.17.1
# via sphinx
filelock==3.0.12
# via
# tox
# virtualenv
identify==2.2.3
identify==2.2.4
# via pre-commit
idna==2.10
# via requests
Expand All @@ -39,7 +39,9 @@ iniconfig==1.1.1
jinja2==2.11.3
# via sphinx
markupsafe==1.1.1
# via jinja2
# via
# jinja2
# sphinx
mypy-extensions==0.4.3
# via mypy
mypy==0.812
Expand All @@ -52,7 +54,7 @@ packaging==20.9
# pytest
# sphinx
# tox
pallets-sphinx-themes==2.0.0rc1
pallets-sphinx-themes==2.0.0
# via -r requirements/docs.in
pep517==0.10.0
# via pip-tools
Expand All @@ -68,27 +70,27 @@ py==1.10.0
# via
# pytest
# tox
pygments==2.8.1
pygments==2.9.0
# via sphinx
pyparsing==2.4.7
# via packaging
pytest==6.2.3
pytest==6.2.4
# via -r requirements/tests.in
pytz==2021.1
# via babel
pyyaml==5.4.1
# via pre-commit
requests==2.25.1
# via sphinx
six==1.15.0
six==1.16.0
# via
# tox
# virtualenv
snowballstemmer==2.1.0
# via sphinx
sphinx-issues==1.2.0
# via -r requirements/docs.in
sphinx==3.5.4
sphinx==4.0.1
# via
# -r requirements/docs.in
# pallets-sphinx-themes
Expand All @@ -114,15 +116,15 @@ toml==0.10.2
# pre-commit
# pytest
# tox
tox==3.23.0
tox==3.23.1
# via -r requirements/dev.in
typed-ast==1.4.3
# via mypy
typing-extensions==3.7.4.3
typing-extensions==3.10.0.0
# via mypy
urllib3==1.26.4
# via requests
virtualenv==20.4.3
virtualenv==20.4.6
# via
# pre-commit
# tox
Expand Down
2 changes: 1 addition & 1 deletion requirements/docs.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Pallets-Sphinx-Themes >= 2.0.0rc1
Pallets-Sphinx-Themes
Sphinx
sphinx-issues
sphinxcontrib-log-cabinet
14 changes: 8 additions & 6 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
#
alabaster==0.7.12
# via sphinx
babel==2.9.0
babel==2.9.1
# via sphinx
certifi==2020.12.5
# via requests
chardet==4.0.0
# via requests
docutils==0.16
docutils==0.17.1
# via sphinx
idna==2.10
# via requests
Expand All @@ -21,14 +21,16 @@ imagesize==1.2.0
jinja2==2.11.3
# via sphinx
markupsafe==1.1.1
# via jinja2
# via
# jinja2
# sphinx
packaging==20.9
# via
# pallets-sphinx-themes
# sphinx
pallets-sphinx-themes==2.0.0rc1
pallets-sphinx-themes==2.0.0
# via -r requirements/docs.in
pygments==2.8.1
pygments==2.9.0
# via sphinx
pyparsing==2.4.7
# via packaging
Expand All @@ -40,7 +42,7 @@ snowballstemmer==2.1.0
# via sphinx
sphinx-issues==1.2.0
# via -r requirements/docs.in
sphinx==3.5.4
sphinx==4.0.1
# via
# -r requirements/docs.in
# pallets-sphinx-themes
Expand Down
4 changes: 2 additions & 2 deletions requirements/tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile requirements/tests.in
#
attrs==20.3.0
attrs==21.2.0
# via pytest
iniconfig==1.1.1
# via pytest
Expand All @@ -16,7 +16,7 @@ py==1.10.0
# via pytest
pyparsing==2.4.7
# via packaging
pytest==6.2.3
pytest==6.2.4
# via -r requirements/tests.in
toml==0.10.2
# via pytest
2 changes: 1 addition & 1 deletion requirements/typing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ mypy==0.812
# via -r requirements/typing.in
typed-ast==1.4.3
# via mypy
typing-extensions==3.7.4.3
typing-extensions==3.10.0.0
# via mypy
2 changes: 1 addition & 1 deletion src/markupsafe/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def __html__(self) -> str:
pass


__version__ = "2.0.0rc2"
__version__ = "2.0.0"

_striptags_re = re.compile(r"(<!--.*?-->|<[^>]*>)")

Expand Down

0 comments on commit e7930ee

Please sign in to comment.