diff options
author | David Lord <davidism@gmail.com> | 2021-10-06 06:50:29 -0700 |
---|---|---|
committer | David Lord <davidism@gmail.com> | 2021-10-06 06:50:29 -0700 |
commit | 048325d7571fcba789f35002ad4fff8c88808206 (patch) | |
tree | e7eef49e04226d9940123fd84800dfff989bb374 | |
parent | 14ace8091c34f1e67c41d83d78739e7ea6921be8 (diff) | |
parent | 1b15563fe9104df8f6fa10bca94415033e77d7b3 (diff) | |
download | markupsafe-048325d7571fcba789f35002ad4fff8c88808206.tar.gz |
Merge branch '2.0.x'
-rw-r--r-- | .pre-commit-config.yaml | 4 | ||||
-rw-r--r-- | requirements/dev.txt | 61 | ||||
-rw-r--r-- | requirements/docs.txt | 24 | ||||
-rw-r--r-- | requirements/tests.txt | 4 | ||||
-rw-r--r-- | requirements/typing.txt | 6 | ||||
-rw-r--r-- | setup.py | 12 |
6 files changed, 57 insertions, 54 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 26ac812..e5919a6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ ci: autoupdate_schedule: monthly repos: - repo: https://github.com/asottile/pyupgrade - rev: v2.25.0 + rev: v2.29.0 hooks: - id: pyupgrade args: ["--py36-plus"] @@ -12,7 +12,7 @@ repos: - id: reorder-python-imports args: ["--application-directories", "src"] - repo: https://github.com/psf/black - rev: 21.8b0 + rev: 21.9b0 hooks: - id: black - repo: https://github.com/PyCQA/flake8 diff --git a/requirements/dev.txt b/requirements/dev.txt index f77a31a..c3e84b3 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -6,47 +6,47 @@ # alabaster==0.7.12 # via sphinx -appdirs==1.4.4 - # via virtualenv attrs==21.2.0 # via pytest babel==2.9.1 # via sphinx -certifi==2020.12.5 +backports.entry-points-selectable==1.1.0 + # via virtualenv +certifi==2021.5.30 # via requests -cfgv==3.3.0 +cfgv==3.3.1 # via pre-commit -chardet==4.0.0 +charset-normalizer==2.0.6 # via requests click==8.0.1 # via pip-tools -distlib==0.3.1 +distlib==0.3.3 # via virtualenv docutils==0.17.1 # via sphinx -filelock==3.0.12 +filelock==3.3.0 # via # tox # virtualenv -identify==2.2.4 +identify==2.3.0 # via pre-commit -idna==2.10 +idna==3.2 # via requests imagesize==1.2.0 # via sphinx iniconfig==1.1.1 # via pytest -jinja2==3.0.1 +jinja2==3.0.2 # via sphinx markupsafe==2.0.1 # via jinja2 -mypy==0.910 - # via -r requirements/typing.in mypy-extensions==0.4.3 # via mypy +mypy==0.910 + # via -r requirements/typing.in nodeenv==1.6.0 # via pre-commit -packaging==20.9 +packaging==21.0 # via # pallets-sphinx-themes # pytest @@ -54,31 +54,33 @@ packaging==20.9 # tox pallets-sphinx-themes==2.0.1 # via -r requirements/docs.in -pep517==0.10.0 +pep517==0.11.0 # via pip-tools -pip-tools==6.2.0 +pip-tools==6.3.0 # via -r requirements/dev.in -pluggy==0.13.1 +platformdirs==2.4.0 + # via virtualenv +pluggy==1.0.0 # via # pytest # tox -pre-commit==2.14.1 +pre-commit==2.15.0 # via -r requirements/dev.in py==1.10.0 # via # pytest # tox -pygments==2.9.0 +pygments==2.10.0 # via sphinx pyparsing==2.4.7 # via packaging pytest==6.2.5 # via -r requirements/tests.in -pytz==2021.1 +pytz==2021.3 # via babel pyyaml==5.4.1 # via pre-commit -requests==2.25.1 +requests==2.26.0 # via sphinx six==1.16.0 # via @@ -86,14 +88,14 @@ six==1.16.0 # virtualenv snowballstemmer==2.1.0 # via sphinx -sphinx==4.1.2 +sphinx-issues==1.2.0 + # via -r requirements/docs.in +sphinx==4.2.0 # via # -r requirements/docs.in # pallets-sphinx-themes # sphinx-issues # sphinxcontrib-log-cabinet -sphinx-issues==1.2.0 - # via -r requirements/docs.in sphinxcontrib-applehelp==1.0.2 # via sphinx sphinxcontrib-devhelp==1.0.2 @@ -111,21 +113,22 @@ sphinxcontrib-serializinghtml==1.1.5 toml==0.10.2 # via # mypy - # pep517 # pre-commit # pytest # tox -tox==3.24.3 +tomli==1.2.1 + # via pep517 +tox==3.24.4 # via -r requirements/dev.in -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via mypy -urllib3==1.26.5 +urllib3==1.26.7 # via requests -virtualenv==20.4.6 +virtualenv==20.8.1 # via # pre-commit # tox -wheel==0.36.2 +wheel==0.37.0 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/docs.txt b/requirements/docs.txt index 885e6ff..aa2df23 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -8,44 +8,44 @@ alabaster==0.7.12 # via sphinx babel==2.9.1 # via sphinx -certifi==2020.12.5 +certifi==2021.5.30 # via requests -chardet==4.0.0 +charset-normalizer==2.0.6 # via requests docutils==0.17.1 # via sphinx -idna==2.10 +idna==3.2 # via requests imagesize==1.2.0 # via sphinx -jinja2==3.0.1 +jinja2==3.0.2 # via sphinx markupsafe==2.0.1 # via jinja2 -packaging==20.9 +packaging==21.0 # via # pallets-sphinx-themes # sphinx pallets-sphinx-themes==2.0.1 # via -r requirements/docs.in -pygments==2.9.0 +pygments==2.10.0 # via sphinx pyparsing==2.4.7 # via packaging -pytz==2021.1 +pytz==2021.3 # via babel -requests==2.25.1 +requests==2.26.0 # via sphinx snowballstemmer==2.1.0 # via sphinx -sphinx==4.1.2 +sphinx-issues==1.2.0 + # via -r requirements/docs.in +sphinx==4.2.0 # via # -r requirements/docs.in # pallets-sphinx-themes # sphinx-issues # sphinxcontrib-log-cabinet -sphinx-issues==1.2.0 - # via -r requirements/docs.in sphinxcontrib-applehelp==1.0.2 # via sphinx sphinxcontrib-devhelp==1.0.2 @@ -60,7 +60,7 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -urllib3==1.26.5 +urllib3==1.26.7 # via requests # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/tests.txt b/requirements/tests.txt index 89031f8..b899729 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -8,9 +8,9 @@ attrs==21.2.0 # via pytest iniconfig==1.1.1 # via pytest -packaging==20.9 +packaging==21.0 # via pytest -pluggy==0.13.1 +pluggy==1.0.0 # via pytest py==1.10.0 # via pytest diff --git a/requirements/typing.txt b/requirements/typing.txt index fa04c8a..f5af819 100644 --- a/requirements/typing.txt +++ b/requirements/typing.txt @@ -4,11 +4,11 @@ # # pip-compile requirements/typing.in # -mypy==0.910 - # via -r requirements/typing.in mypy-extensions==0.4.3 # via mypy +mypy==0.910 + # via -r requirements/typing.in toml==0.10.2 # via mypy -typing-extensions==3.10.0.0 +typing-extensions==3.10.0.2 # via mypy @@ -22,18 +22,18 @@ class ve_build_ext(build_ext): def run(self): try: build_ext.run(self) - except DistutilsPlatformError: - raise BuildFailed() + except DistutilsPlatformError as e: + raise BuildFailed() from e def build_extension(self, ext): try: build_ext.build_extension(self, ext) - except (CCompilerError, DistutilsExecError, DistutilsPlatformError): - raise BuildFailed() - except ValueError: + except (CCompilerError, DistutilsExecError, DistutilsPlatformError) as e: + raise BuildFailed() from e + except ValueError as e: # this can happen on Windows 64 bit, see Python issue 7511 if "'path'" in str(sys.exc_info()[1]): # works with Python 2 and 3 - raise BuildFailed() + raise BuildFailed() from e raise |