From: David Lord Date: Thu, 1 Jun 2023 17:47:07 +0000 (-0700) Subject: update dependencies X-Git-Tag: 3.1.3~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae312b3065d83085744cfb3c051f06c90a9b389a;p=thirdparty%2Fjinja.git update dependencies --- diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9c2bc0b9..620bd11f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ ci: autoupdate_schedule: monthly repos: - repo: https://github.com/asottile/pyupgrade - rev: v3.3.2 + rev: v3.4.0 hooks: - id: pyupgrade args: ["--py37-plus"] @@ -23,7 +23,7 @@ repos: - id: flake8 additional_dependencies: [flake8-bugbear] - repo: https://github.com/peterdemin/pip-compile-multi - rev: v2.6.2 + rev: v2.6.3 hooks: - id: pip-compile-multi-verify - repo: https://github.com/pre-commit/pre-commit-hooks diff --git a/requirements/build.txt b/requirements/build.txt index a735b3d0..98175b85 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -5,13 +5,11 @@ # # pip-compile-multi # -build==0.9.0 +build==0.10.0 # via -r requirements/build.in -packaging==23.0 +packaging==23.1 # via build -pep517==0.13.0 +pyproject-hooks==1.0.0 # via build tomli==2.0.1 - # via - # build - # pep517 + # via build diff --git a/requirements/dev.txt b/requirements/dev.txt index bde64ee3..99a6f034 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,9 +8,9 @@ -r docs.txt -r tests.txt -r typing.txt -build==0.9.0 +build==0.10.0 # via pip-tools -cachetools==5.2.0 +cachetools==5.3.1 # via tox cfgv==3.3.1 # via pre-commit @@ -24,39 +24,39 @@ colorama==0.4.6 # via tox distlib==0.3.6 # via virtualenv -filelock==3.9.0 +filelock==3.12.0 # via # tox # virtualenv -identify==2.5.11 +identify==2.5.24 # via pre-commit -nodeenv==1.7.0 +nodeenv==1.8.0 # via pre-commit -pep517==0.13.0 - # via build -pip-compile-multi==2.6.1 +pip-compile-multi==2.6.3 # via -r requirements/dev.in -pip-tools==6.12.1 +pip-tools==6.13.0 # via pip-compile-multi -platformdirs==2.6.2 +platformdirs==3.5.1 # via # tox # virtualenv -pre-commit==2.21.0 +pre-commit==3.3.2 # via -r requirements/dev.in -pyproject-api==1.2.1 +pyproject-api==1.5.1 # via tox +pyproject-hooks==1.0.0 + # via build pyyaml==6.0 # via pre-commit -toposort==1.7 +toposort==1.10 # via pip-compile-multi -tox==4.1.0 +tox==4.5.2 # via -r requirements/dev.in -virtualenv==20.17.1 +virtualenv==20.23.0 # via # pre-commit # tox -wheel==0.38.4 +wheel==0.40.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 61830109..2c36046b 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -5,15 +5,15 @@ # # pip-compile-multi # -alabaster==0.7.12 +alabaster==0.7.13 # via sphinx -babel==2.11.0 +babel==2.12.1 # via sphinx -certifi==2022.12.7 +certifi==2023.5.7 # via requests -charset-normalizer==2.1.1 +charset-normalizer==3.1.0 # via requests -docutils==0.19 +docutils==0.20.1 # via sphinx idna==3.4 # via requests @@ -21,23 +21,21 @@ imagesize==1.4.1 # via sphinx jinja2==3.1.2 # via sphinx -markupsafe==2.1.1 +markupsafe==2.1.2 # via jinja2 -packaging==22.0 +packaging==23.1 # via # pallets-sphinx-themes # sphinx -pallets-sphinx-themes==2.0.3 +pallets-sphinx-themes==2.1.0 # via -r requirements/docs.in -pygments==2.13.0 +pygments==2.15.1 # via sphinx -pytz==2022.7 - # via babel -requests==2.28.1 +requests==2.31.0 # via sphinx snowballstemmer==2.2.0 # via sphinx -sphinx==6.0.0 +sphinx==7.0.1 # via # -r requirements/docs.in # pallets-sphinx-themes @@ -45,11 +43,11 @@ sphinx==6.0.0 # sphinxcontrib-log-cabinet sphinx-issues==3.0.1 # via -r requirements/docs.in -sphinxcontrib-applehelp==1.0.2 +sphinxcontrib-applehelp==1.0.4 # via sphinx sphinxcontrib-devhelp==1.0.2 # via sphinx -sphinxcontrib-htmlhelp==2.0.0 +sphinxcontrib-htmlhelp==2.0.1 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx @@ -59,5 +57,5 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -urllib3==1.26.13 +urllib3==2.0.2 # via requests diff --git a/requirements/tests.txt b/requirements/tests.txt index fa8c24a2..70ca162b 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -5,17 +5,15 @@ # # pip-compile-multi # -attrs==22.2.0 +exceptiongroup==1.1.1 # via pytest -exceptiongroup==1.1.0 +iniconfig==2.0.0 # via pytest -iniconfig==1.1.1 - # via pytest -packaging==22.0 +packaging==23.1 # via pytest pluggy==1.0.0 # via pytest -pytest==7.2.0 +pytest==7.3.1 # via -r requirements/tests.in tomli==2.0.1 # via pytest diff --git a/requirements/typing.txt b/requirements/typing.txt index a70f3f5c..bc63c0f8 100644 --- a/requirements/typing.txt +++ b/requirements/typing.txt @@ -5,11 +5,11 @@ # # pip-compile-multi # -mypy==0.991 +mypy==1.3.0 # via -r requirements/typing.in -mypy-extensions==0.4.3 +mypy-extensions==1.0.0 # via mypy tomli==2.0.1 # via mypy -typing-extensions==4.4.0 +typing-extensions==4.6.2 # via mypy diff --git a/setup.cfg b/setup.cfg index ec8a7757..cc85bd2f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -44,8 +44,7 @@ babel.extractors = testpaths = tests filterwarnings = error - # Python 3.9 raises a deprecation from internal asyncio code. - ignore:The loop argument:DeprecationWarning:asyncio[.]base_events:542 + ignore:ast:DeprecationWarning [coverage:run] branch = True diff --git a/src/jinja2/environment.py b/src/jinja2/environment.py index 88b26662..9ec7fe76 100644 --- a/src/jinja2/environment.py +++ b/src/jinja2/environment.py @@ -701,7 +701,7 @@ class Environment: .. versionadded:: 2.5 """ - return compile(source, filename, "exec") # type: ignore + return compile(source, filename, "exec") @typing.overload def compile( # type: ignore diff --git a/src/jinja2/nativetypes.py b/src/jinja2/nativetypes.py index ac086103..71db8cc3 100644 --- a/src/jinja2/nativetypes.py +++ b/src/jinja2/nativetypes.py @@ -106,7 +106,7 @@ class NativeTemplate(Template): try: return self.environment_class.concat( # type: ignore - self.root_render_func(ctx) # type: ignore + self.root_render_func(ctx) ) except Exception: return self.environment.handle_exception() diff --git a/src/jinja2/utils.py b/src/jinja2/utils.py index 9b5f5a50..94525a0e 100644 --- a/src/jinja2/utils.py +++ b/src/jinja2/utils.py @@ -182,7 +182,7 @@ def object_type_repr(obj: t.Any) -> str: def pformat(obj: t.Any) -> str: """Format an object using :func:`pprint.pformat`.""" - from pprint import pformat # type: ignore + from pprint import pformat return pformat(obj) diff --git a/tests/test_filters.py b/tests/test_filters.py index 73f0f0be..32897c54 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -870,4 +870,6 @@ class TestFilter: with pytest.raises(TemplateRuntimeError, match="No filter named 'f'"): t1.render(x=42) + + with pytest.raises(TemplateRuntimeError, match="No filter named 'f'"): t2.render(x=42) diff --git a/tests/test_inheritance.py b/tests/test_inheritance.py index 8398f4df..0a525e7a 100644 --- a/tests/test_inheritance.py +++ b/tests/test_inheritance.py @@ -355,8 +355,11 @@ class TestInheritance: ) ) tmpl = env.get_template("child") + with pytest.raises(TemplateSyntaxError): tmpl.render(default="default1", seq=list(range(3))) + + with pytest.raises(TemplateSyntaxError): tmpl.render(default="default2", seq=list(range(3)))