]>
git.ipfire.org Git - thirdparty/jinja.git/log
David Lord [Fri, 18 Feb 2022 01:05:05 +0000 (17:05 -0800)]
unpin pytest
David Lord [Fri, 18 Feb 2022 01:04:40 +0000 (17:04 -0800)]
Merge branch '3.0.x'
David Lord [Fri, 18 Feb 2022 01:04:14 +0000 (17:04 -0800)]
Merge pull request #1584 from pallets/update-requirements
update requirements
David Lord [Fri, 18 Feb 2022 00:58:26 +0000 (16:58 -0800)]
stop using dependabot for python, too noisy
David Lord [Fri, 18 Feb 2022 00:58:13 +0000 (16:58 -0800)]
cache pip with setup-python action
David Lord [Fri, 18 Feb 2022 00:55:58 +0000 (16:55 -0800)]
use pip-compile-multi for requirements
David Lord [Fri, 18 Feb 2022 00:53:43 +0000 (16:53 -0800)]
update pre-commit hooks
David Lord [Wed, 26 Jan 2022 16:23:40 +0000 (08:23 -0800)]
Merge pull request #1574 from adamchainz/docs_html
Update legacy doctype in docs/tricks
Adam Johnson [Wed, 26 Jan 2022 16:18:52 +0000 (16:18 +0000)]
Update legacy doctype in docs/tricks
David Lord [Thu, 13 Jan 2022 23:09:05 +0000 (15:09 -0800)]
Merge pull request #1571 from pallets/python3.7-identifier-pattern
update identifier pattern for Python 3.7
David Lord [Thu, 13 Jan 2022 22:57:21 +0000 (14:57 -0800)]
update identifier pattern for Python 3.7
David Lord [Thu, 13 Jan 2022 22:46:46 +0000 (14:46 -0800)]
Merge branch '3.0.x'
David Lord [Thu, 13 Jan 2022 22:45:55 +0000 (14:45 -0800)]
update tool config
David Lord [Wed, 12 Jan 2022 19:47:49 +0000 (11:47 -0800)]
Merge branch '3.0.x'
David Lord [Wed, 12 Jan 2022 19:47:32 +0000 (11:47 -0800)]
Merge pull request #1570 from pallets/update-requirements
update requirements
David Lord [Wed, 12 Jan 2022 19:40:58 +0000 (11:40 -0800)]
update requirements
David Lord [Sun, 26 Dec 2021 23:18:33 +0000 (16:18 -0700)]
Merge remote-tracking branch 'origin/3.0.x'
David Lord [Sun, 26 Dec 2021 23:17:10 +0000 (16:17 -0700)]
Merge pull request #1560 from pallets/update-tools
update tools
David Lord [Sun, 26 Dec 2021 23:10:04 +0000 (16:10 -0700)]
pin os and python version in rtd build
David Lord [Sun, 26 Dec 2021 23:07:23 +0000 (16:07 -0700)]
update option names for v3
David Lord [Sun, 26 Dec 2021 23:05:29 +0000 (16:05 -0700)]
updates go to maintenance branch
David Lord [Sun, 26 Dec 2021 18:55:30 +0000 (11:55 -0700)]
Merge pull request #1559 from pallets/i18n-context-block
specify context for translation block
David Lord [Sun, 26 Dec 2021 18:29:39 +0000 (11:29 -0700)]
specify context for translation block
David Lord [Sun, 26 Dec 2021 14:48:45 +0000 (07:48 -0700)]
Merge branch '3.0.x'
David Lord [Sun, 26 Dec 2021 14:44:17 +0000 (07:44 -0700)]
Merge pull request #1558 from pallets:update-requirements
update requirements
David Lord [Sun, 26 Dec 2021 14:39:10 +0000 (07:39 -0700)]
fix new mypy findings
David Lord [Sun, 26 Dec 2021 14:38:45 +0000 (07:38 -0700)]
update requirements
David Lord [Sat, 25 Dec 2021 02:23:17 +0000 (19:23 -0700)]
Merge pull request #1557 from bzinberg/patch-1
Typo in docs (trailing backtick)
Ben Zinberg [Fri, 24 Dec 2021 23:22:57 +0000 (18:22 -0500)]
Typo in docs (trailing backtick)
At least, I _think_ this is a typo? :slightly_smiling_face:
David Lord [Sun, 28 Nov 2021 19:14:18 +0000 (11:14 -0800)]
Merge pull request #1548 from mabdelaal86/patch-1
Fix little typo in docstring
Mohamed Abdelaal [Sun, 28 Nov 2021 18:34:23 +0000 (19:34 +0100)]
Fix little typo in docstring
Fix a little typo in `do_sort` docstring.
David Lord [Wed, 10 Nov 2021 19:19:29 +0000 (11:19 -0800)]
Merge pull request #1511 from mkrizek/issue-1510
Support native types in macros
Martin Krizek [Wed, 13 Oct 2021 14:56:48 +0000 (16:56 +0200)]
support native types in macros
David Lord [Wed, 10 Nov 2021 19:14:10 +0000 (11:14 -0800)]
Merge pull request #1544 from pallets/remove-deprecated-code
remove deprecated code
David Lord [Wed, 10 Nov 2021 19:05:12 +0000 (11:05 -0800)]
update docs requirements
new version of pallets-sphinx-themes to address removals
David Lord [Tue, 9 Nov 2021 20:52:27 +0000 (12:52 -0800)]
remove deprecated unicode_urlencode
David Lord [Tue, 9 Nov 2021 20:50:28 +0000 (12:50 -0800)]
remove deprecated legacy resolve mode for context subclass
David Lord [Tue, 9 Nov 2021 20:46:20 +0000 (12:46 -0800)]
remove deprecated unicode_join runtime alias
David Lord [Tue, 9 Nov 2021 20:44:30 +0000 (12:44 -0800)]
remove deprecated Markup and escape aliases
David Lord [Tue, 9 Nov 2021 20:42:59 +0000 (12:42 -0800)]
remove deprecated template function decorators
David Lord [Tue, 9 Nov 2021 20:37:01 +0000 (12:37 -0800)]
remove deprecated extensions
David Lord [Tue, 9 Nov 2021 20:28:39 +0000 (12:28 -0800)]
Merge branch '3.0.x'
David Lord [Tue, 9 Nov 2021 20:25:09 +0000 (12:25 -0800)]
Merge pull request #1543 from pallets/release-3.0.3
release version 3.0.3
David Lord [Tue, 9 Nov 2021 20:22:19 +0000 (12:22 -0800)]
release version 3.0.3
David Lord [Tue, 9 Nov 2021 20:21:05 +0000 (12:21 -0800)]
Merge pull request #1542 from pallets/package-loader-file
PackageLoader works with single module file
David Lord [Tue, 9 Nov 2021 20:14:48 +0000 (12:14 -0800)]
PackageLoader works with single module file
David Lord [Tue, 9 Nov 2021 18:54:26 +0000 (10:54 -0800)]
Merge pull request #1541 from pallets/docs-pow-order
document chained pow order
David Lord [Tue, 9 Nov 2021 18:50:35 +0000 (10:50 -0800)]
document chained pow order
David Lord [Tue, 9 Nov 2021 18:35:56 +0000 (10:35 -0800)]
Merge pull request #1540 from pallets/docs-macro-defaults
rewrite docs about extending template objects
David Lord [Tue, 9 Nov 2021 18:32:06 +0000 (10:32 -0800)]
rewrite docs about extending template objects
David Lord [Tue, 9 Nov 2021 18:15:16 +0000 (10:15 -0800)]
Merge pull request #1539 from pallets/docs-macro-defaults
remove reference to macro.defaults
David Lord [Tue, 9 Nov 2021 18:13:10 +0000 (10:13 -0800)]
remove reference to macro.defaults
David Lord [Tue, 9 Nov 2021 18:10:05 +0000 (10:10 -0800)]
Merge pull request #1538 from pallets/docs-template
rewrite Template class doc
David Lord [Tue, 9 Nov 2021 18:05:35 +0000 (10:05 -0800)]
rewrite Template class doc
David Lord [Tue, 9 Nov 2021 17:17:51 +0000 (09:17 -0800)]
Merge pull request #1509 from kianmeng/fix-typos
Fix typos
David Lord [Tue, 9 Nov 2021 17:16:49 +0000 (09:16 -0800)]
Merge pull request #1522 from klette/fix-node-hash
Use `object.__hash__` for `Node.__hash__`
Kristian Klette [Wed, 27 Oct 2021 18:35:20 +0000 (20:35 +0200)]
Use object.__hash__ for Node.__hash__
This fixes a regression in commit
60293416db69782fd048a7820667afa4ae7c423b that
changed the `__hash__` implementation of Node from the default pointer
hash, to a hash based on the node fields.
Since these fields contains list objects, they are not hashable, making
every call to `Node.__hash__` fail.
This breaks some third-party usage such as in `django-compressor`
(See: https://github.com/django-compressor/django-compressor/issues/1060)
This changed reverts the hash method back to using `object.__hash__` as
the hash implementation.
David Lord [Tue, 9 Nov 2021 16:54:15 +0000 (08:54 -0800)]
Merge pull request #1516 from mohd-akram/async-perf
Reduce async overhead due to auto_await
Mohamed Akram [Mon, 18 Oct 2021 19:58:54 +0000 (23:58 +0400)]
Reduce async overhead due to auto_await
David Lord [Tue, 9 Nov 2021 16:46:33 +0000 (08:46 -0800)]
Merge pull request #1537 from mkrizek/literal_eval-py-310
native: keep same behavior on Python 3.10
Martin Krizek [Tue, 9 Nov 2021 16:15:31 +0000 (17:15 +0100)]
native: keep same behavior on Python 3.10
David Lord [Tue, 9 Nov 2021 16:27:21 +0000 (08:27 -0800)]
Merge pull request #1536 from pallets/traceback-codetype
simplify CodeType rewriting
David Lord [Tue, 9 Nov 2021 15:10:53 +0000 (07:10 -0800)]
simplify CodeType rewriting
David Lord [Mon, 8 Nov 2021 16:23:31 +0000 (08:23 -0800)]
Merge pull request #1534 from pallets/drop-python-3.6
drop Python 3.6
David Lord [Mon, 8 Nov 2021 16:07:29 +0000 (08:07 -0800)]
drop Python 3.6
David Lord [Fri, 5 Nov 2021 14:22:41 +0000 (07:22 -0700)]
Merge branch '3.0.x'
David Lord [Fri, 5 Nov 2021 14:22:28 +0000 (07:22 -0700)]
Merge pull request #1527 from hroncok/py3.11-tracebacks
Tests: Adapt expected traceback regexes for Python 3.11.0a1
Miro Hrončok [Thu, 4 Nov 2021 17:03:06 +0000 (18:03 +0100)]
Tests: Adapt expected traceback regexes for Python 3.11.0a1
Fixes https://github.com/pallets/jinja/issues/1526
Before:
File ".../broken.html", line 2, in <module>
{{ fail() }}
File ".../test_debug.py", line 32, in <lambda>
tmpl.render(fail=lambda: 1 / 0)
ZeroDivisionError: division by zero
After:
File ".../broken.html", line 2, in <module>
{{ fail() }}
^^^^^^^^^^^^
File ".../test_debug.py", line 32, in <lambda>
tmpl.render(fail=lambda: 1 / 0)
~~^~~
ZeroDivisionError: division by zero
David Lord [Fri, 5 Nov 2021 14:18:41 +0000 (07:18 -0700)]
Merge pull request #1531 from pallets/test-3.11
test Python 3.11
David Lord [Fri, 5 Nov 2021 14:15:25 +0000 (07:15 -0700)]
test Python 3.11
David Lord [Fri, 5 Nov 2021 14:13:12 +0000 (07:13 -0700)]
update py==1.11.0 to work on Python 3.11
David Lord [Fri, 5 Nov 2021 13:46:22 +0000 (06:46 -0700)]
Merge branch '3.0.x'
David Lord [Fri, 5 Nov 2021 13:45:06 +0000 (06:45 -0700)]
Merge pull request #1530 from pallets/test-3.10
test Python 3.10
David Lord [Fri, 5 Nov 2021 13:32:06 +0000 (06:32 -0700)]
test Python 3.10
David Lord [Tue, 2 Nov 2021 16:25:12 +0000 (09:25 -0700)]
Merge pull request #1525 from hroncok/patch-1
Tests: Make "Traceback did not match" an actual f-string
Miro Hrončok [Tue, 2 Nov 2021 15:47:28 +0000 (16:47 +0100)]
Tests: Make "Traceback did not match" an actual f-string
Otherwise the failure looks like this:
> assert (
m is not None
), "Traceback did not match:\n\n{''.join(tb)}\nexpected:\n{expected_tb}"
E AssertionError: Traceback did not match:
E
E {''.join(tb)}
E expected:
E {expected_tb}
E assert None is not None
David Lord [Mon, 1 Nov 2021 19:48:16 +0000 (12:48 -0700)]
Merge branch '3.0.x'
David Lord [Mon, 1 Nov 2021 19:47:56 +0000 (12:47 -0700)]
Merge pull request #1524 from pallets/update-requirements
update requirements
David Lord [Mon, 1 Nov 2021 19:44:28 +0000 (12:44 -0700)]
update requirements
Kian-Meng, Ang [Tue, 12 Oct 2021 14:36:44 +0000 (22:36 +0800)]
Fix typos
David Lord [Tue, 5 Oct 2021 00:54:36 +0000 (17:54 -0700)]
Merge branch '3.0.x'
David Lord [Tue, 5 Oct 2021 00:53:10 +0000 (17:53 -0700)]
Merge pull request #1506 from pallets/release-3.0.2
release version 3.0.2
David Lord [Tue, 5 Oct 2021 00:48:23 +0000 (17:48 -0700)]
release version 3.0.2
David Lord [Tue, 5 Oct 2021 00:45:34 +0000 (17:45 -0700)]
Merge pull request #1505 from pallets/package-loader-path
omit curdir from PackageLoader root path
David Lord [Tue, 5 Oct 2021 00:39:39 +0000 (17:39 -0700)]
omit curdir from PackageLoader root path
fixes compatibility with zip imports
Co-authored-by: kuepe-sl <peter_kueffner@web.de>
David Lord [Mon, 4 Oct 2021 20:51:05 +0000 (13:51 -0700)]
Merge pull request #1495 from daniel-stoneuk/patch-async-globals
Daniel Stone [Sat, 18 Sep 2021 15:24:10 +0000 (16:24 +0100)]
imported macros can access template globals in async mode
David Lord [Mon, 4 Oct 2021 20:28:06 +0000 (13:28 -0700)]
Merge branch '3.0.x'
David Lord [Mon, 4 Oct 2021 20:25:34 +0000 (13:25 -0700)]
Merge pull request #1504 from pallets/update-requirements
update requirements
David Lord [Mon, 4 Oct 2021 20:22:49 +0000 (13:22 -0700)]
apply pyupgrade
David Lord [Mon, 4 Oct 2021 20:22:34 +0000 (13:22 -0700)]
update pre-commit hooks
David Lord [Mon, 4 Oct 2021 20:22:22 +0000 (13:22 -0700)]
update requirements
David Lord [Mon, 4 Oct 2021 20:19:54 +0000 (13:19 -0700)]
Merge pull request #1503 from pallets/except-chain
use exception chaining
David Lord [Mon, 4 Oct 2021 20:16:13 +0000 (13:16 -0700)]
use exception chaining
fixes flake8-bugbear B904
David Lord [Mon, 4 Oct 2021 19:47:32 +0000 (12:47 -0700)]
Merge pull request #1501 from pallets/ignore-internal-warning
ignore internal asyncio warning
David Lord [Mon, 4 Oct 2021 19:19:05 +0000 (12:19 -0700)]
ignore internal asyncio warning
https://bugs.python.org/issue45097
David Lord [Wed, 8 Sep 2021 15:19:10 +0000 (08:19 -0700)]
Merge pull request #1492 from pallets/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] [Mon, 6 Sep 2021 19:09:13 +0000 (19:09 +0000)]
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/pyupgrade: v2.23.1 → v2.25.0](https://github.com/asottile/pyupgrade/compare/v2.23.1...v2.25.0)
- [github.com/psf/black: 21.7b0 → 21.8b0](https://github.com/psf/black/compare/21.7b0...21.8b0)
David Lord [Wed, 1 Sep 2021 15:30:13 +0000 (08:30 -0700)]
Merge pull request #1490 from pallets/dependabot/pip/tox-3.24.3
Bump tox from 3.24.1 to 3.24.3
dependabot[bot] [Wed, 1 Sep 2021 15:19:50 +0000 (15:19 +0000)]
Bump tox from 3.24.1 to 3.24.3
Bumps [tox](https://github.com/tox-dev/tox) from 3.24.1 to 3.24.3.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/master/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/3.24.1...3.24.3)
---
updated-dependencies:
- dependency-name: tox
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>