]>
git.ipfire.org Git - thirdparty/jinja.git/log
Matěj Volf [Tue, 9 Mar 2021 19:42:11 +0000 (20:42 +0100)]
Fix incorrect docs - line statements have no default
David Lord [Mon, 5 Apr 2021 21:23:33 +0000 (14:23 -0700)]
Merge pull request #1364 from Dreamsorcerer/patch-2
Fix map documentation
Sam Bull [Fri, 5 Mar 2021 10:52:39 +0000 (10:52 +0000)]
Fix map documentation
David Lord [Mon, 5 Apr 2021 21:18:56 +0000 (14:18 -0700)]
Merge pull request #1236 from sixtyfathoms/fix/issue-1184
Update wording on dictionary default ordering
jeff [Sat, 13 Jun 2020 23:30:27 +0000 (13:30 -1000)]
update wording on dictionary default ordering
David Lord [Mon, 5 Apr 2021 21:08:20 +0000 (14:08 -0700)]
Merge pull request #1226 from geographika/patch-1
Add symbol names for tilde and pipe
Seth G [Tue, 26 May 2020 16:46:18 +0000 (18:46 +0200)]
add symbol names for tilde and pipe operators
David Lord [Mon, 5 Apr 2021 18:50:38 +0000 (11:50 -0700)]
Merge pull request #1366 from mvolfik/fix-unicode-newlines
Fix unicode newlines
Matěj Volf [Tue, 9 Mar 2021 13:19:58 +0000 (14:19 +0100)]
Split lines in lexer only by \r\n, \r and \n
Python str.splitlines() splits by more characters[1], which, however,
causes problems when keeping these special characters in processed
templates is desirable, i.e. these bug reports: #769, #952, #1313.
The keep_trailing_newlines logic is reworked because splitlines()
removes them already (so they had to be added), while re.split doesn't
so they have to be removed.
[1] https://docs.python.org/3/library/stdtypes.html#str.splitlines
David Lord [Mon, 5 Apr 2021 18:38:54 +0000 (11:38 -0700)]
Merge pull request #1363 from remidebette/add-native-async-support
Add async support to NativeEnvironment
remidebette [Tue, 2 Mar 2021 22:12:30 +0000 (23:12 +0100)]
NativeEnvironment supports async mode
David Lord [Mon, 5 Apr 2021 17:53:57 +0000 (10:53 -0700)]
Merge pull request #1294 from Jafnee/chainableundefined-aiter-bug
Add __aiter__ to Undefined
Jafnee [Wed, 23 Sep 2020 10:34:58 +0000 (18:34 +0800)]
add Undefined.__aiter__
David Lord [Mon, 5 Apr 2021 17:46:24 +0000 (10:46 -0700)]
Merge pull request #1204 from dparker2/undefined-contains
Raise UndefinedError from Undefined.__contains__
David Parker [Sat, 9 May 2020 20:04:28 +0000 (13:04 -0700)]
Undefined.__contains__ raises UndefinedError
David Lord [Mon, 5 Apr 2021 17:40:02 +0000 (10:40 -0700)]
Merge pull request #1171 from amykyta3/feature/base-integer-literals
Add support for hex, octal, and binary integer literals
Alex Mykyta [Wed, 11 Mar 2020 03:57:28 +0000 (20:57 -0700)]
parse hex, octal, and binary integer literals
David Lord [Mon, 5 Apr 2021 17:24:35 +0000 (10:24 -0700)]
Merge pull request #1385 from pallets/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] [Mon, 5 Apr 2021 17:10:51 +0000 (17:10 +0000)]
[pre-commit.ci] pre-commit autoupdate
David Lord [Mon, 5 Apr 2021 16:53:29 +0000 (09:53 -0700)]
Merge pull request #1167 from LarsKollstedt/allow_indent_with_generic_char
indent filter can indent with arbitrary characters
Lars Kollstedt [Tue, 10 Mar 2020 11:26:44 +0000 (12:26 +0100)]
filters.py: do_indent: ident filter can indent with arbitrary characters
Allow indention with generic characters, e.g. Tabs.
Implemenented the behavior requested in
https://github.com/pallets/jinja/pull/1167#issuecomment-
612644701
The width param can be string or int, if it is string it's the raw
indention e.g. "\t". If it's int it's the number of spaces. In other
cases an FilterArgumentError is raised, to avoid confusion.
David Lord [Mon, 5 Apr 2021 16:33:52 +0000 (09:33 -0700)]
Merge pull request #1384 from pallets/typing-filters-tests
add type annotations to filters and tests
David Lord [Mon, 5 Apr 2021 16:25:26 +0000 (09:25 -0700)]
add type annotations to filters and tests
Adrian [Mon, 5 Apr 2021 11:57:00 +0000 (13:57 +0200)]
Merge pull request #1126 from imomaliev/pgettext-support
add pgettext to InternationalizationExtension
Sardorbek Imomaliev [Mon, 13 Jan 2020 09:18:10 +0000 (16:18 +0700)]
add pgettext and npgettext
David Lord [Mon, 5 Apr 2021 00:39:15 +0000 (17:39 -0700)]
Merge pull request #1383 from pallets/test-decorators
add 'is filter' and 'is test' tests
David Lord [Mon, 5 Apr 2021 00:20:23 +0000 (17:20 -0700)]
add 'is filter' and 'is test' tests
This required allowing tests to be decorated with '@environmentfilter'.
Tests are essentially the same as filters now, the node, compiler, and
environment have been refactored to extract common behavior.
David Lord [Sun, 4 Apr 2021 17:20:49 +0000 (10:20 -0700)]
Merge pull request #1248 from MLH-Fellowship/test-for-filter
allow optional use of a filter based on its existence
Amy [Fri, 26 Jun 2020 19:26:04 +0000 (15:26 -0400)]
allow optional use of filter based on existence
David Lord [Thu, 1 Apr 2021 00:21:21 +0000 (17:21 -0700)]
Merge pull request #1374 from pallets/docs-globals
Template globals use ChainMap, more docs about globals
David Lord [Tue, 30 Mar 2021 23:38:04 +0000 (16:38 -0700)]
more detailed docs about globals
David Lord [Tue, 30 Mar 2021 14:49:51 +0000 (07:49 -0700)]
Merge pull request #1244 from MLH-Fellowship/cache-bugs
Fix bug with cached templates not registering new globals
Amy [Tue, 23 Jun 2020 19:36:48 +0000 (15:36 -0400)]
fix bug with cached templates not using new globals
Amy Lei [Fri, 26 Mar 2021 22:44:19 +0000 (18:44 -0400)]
Merge pull request #1242 from MLH-Fellowship/context-bug
fix bugs with contextfunction and nested loop variables
Amy [Tue, 23 Jun 2020 14:53:59 +0000 (10:53 -0400)]
track local loop/block vars for contextfunctions
Amy [Mon, 22 Jun 2020 19:27:18 +0000 (15:27 -0400)]
allow scoped blocks to access loop vars
David Lord [Mon, 22 Mar 2021 17:50:29 +0000 (10:50 -0700)]
Merge pull request #1371 from pallets/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] [Mon, 22 Mar 2021 17:05:35 +0000 (17:05 +0000)]
[pre-commit.ci] pre-commit autoupdate
David Lord [Mon, 15 Mar 2021 18:37:08 +0000 (11:37 -0700)]
Merge pull request #1369 from pallets/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] [Mon, 15 Mar 2021 17:01:18 +0000 (17:01 +0000)]
[pre-commit.ci] pre-commit autoupdate
David Lord [Thu, 25 Feb 2021 01:18:38 +0000 (17:18 -0800)]
Merge pull request #1356 from BALaka-18/map-filter-default
Map filter can use False as default
BALaka-18 [Mon, 22 Feb 2021 15:56:22 +0000 (21:26 +0530)]
map filter can use False as default
David Lord [Wed, 24 Feb 2021 18:38:10 +0000 (10:38 -0800)]
Merge pull request #1361 from pallets/consistency
various cleanup for consistency between projects
David Lord [Wed, 24 Feb 2021 17:50:00 +0000 (09:50 -0800)]
move version to setup.cfg
David Lord [Wed, 24 Feb 2021 17:49:31 +0000 (09:49 -0800)]
cache mypy in ci
David Lord [Wed, 24 Feb 2021 17:47:57 +0000 (09:47 -0800)]
consistent typing config
David Lord [Wed, 24 Feb 2021 17:46:54 +0000 (09:46 -0800)]
docs rename changelog to changes, add license
David Lord [Wed, 24 Feb 2021 17:46:20 +0000 (09:46 -0800)]
update project links
David Lord [Tue, 16 Feb 2021 16:41:40 +0000 (08:41 -0800)]
use rtd to build docs for prs
skip code tests when only docs change
David Lord [Mon, 8 Feb 2021 19:57:06 +0000 (11:57 -0800)]
simplify dev install command
David Lord [Mon, 8 Feb 2021 17:13:06 +0000 (09:13 -0800)]
Merge pull request #1351 from pallets/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] [Mon, 8 Feb 2021 16:52:04 +0000 (16:52 +0000)]
[pre-commit.ci] pre-commit autoupdate
David Lord [Sun, 7 Feb 2021 04:40:52 +0000 (20:40 -0800)]
Merge pull request #1350 from pallets/update-test-requirements
update requirements, test Python 3.9
David Lord [Sun, 7 Feb 2021 04:35:29 +0000 (20:35 -0800)]
update requirements, test Python 3.9
sixtyfathoms [Thu, 4 Feb 2021 16:02:48 +0000 (06:02 -1000)]
update building docs instructions in contributing guide (#1235)
David Lord [Tue, 2 Feb 2021 17:52:15 +0000 (09:52 -0800)]
update contributing guide
David Lord [Tue, 2 Feb 2021 06:48:29 +0000 (22:48 -0800)]
Merge pull request #1348 from pallets/json-docs
update tojson docs
David Lord [Tue, 2 Feb 2021 06:35:43 +0000 (22:35 -0800)]
update tojson docs
pre-commit-ci[bot] [Mon, 1 Feb 2021 17:01:49 +0000 (09:01 -0800)]
[pre-commit.ci] pre-commit autoupdate (#1347)
dependabot-preview[bot] [Mon, 1 Feb 2021 10:07:22 +0000 (10:07 +0000)]
Merge pull request #1346 from pallets/dependabot/pip/pytest-6.2.2
dependabot-preview[bot] [Mon, 1 Feb 2021 10:07:15 +0000 (10:07 +0000)]
Merge pull request #1345 from pallets/dependabot/pip/pre-commit-2.10.0
dependabot-preview[bot] [Mon, 1 Feb 2021 09:55:12 +0000 (09:55 +0000)]
Bump pytest from 6.2.1 to 6.2.2
Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.2.1...6.2.2)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Mon, 1 Feb 2021 09:55:02 +0000 (09:55 +0000)]
Bump pre-commit from 2.9.3 to 2.10.0
Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.9.3 to 2.10.0.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pre-commit/pre-commit/compare/v2.9.3...v2.10.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Mon, 1 Feb 2021 09:53:33 +0000 (09:53 +0000)]
Merge pull request #1344 from pallets/dependabot/pip/tox-3.21.3
dependabot-preview[bot] [Mon, 1 Feb 2021 09:49:33 +0000 (09:49 +0000)]
Bump tox from 3.20.1 to 3.21.3
Bumps [tox](https://github.com/tox-dev/tox) from 3.20.1 to 3.21.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.20.1...3.21.3)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
David Lord [Sun, 31 Jan 2021 16:48:44 +0000 (08:48 -0800)]
Merge branch '2.11.x'
David Lord [Sun, 31 Jan 2021 16:44:37 +0000 (08:44 -0800)]
release version 2.11.3
David Lord [Sun, 31 Jan 2021 16:15:28 +0000 (08:15 -0800)]
Merge pull request #1343 from pallets/urlize-speedup
backport urlize speedup
David Lord [Sun, 31 Jan 2021 15:54:40 +0000 (07:54 -0800)]
speed up urlize matching
David Lord [Sun, 31 Jan 2021 07:09:37 +0000 (23:09 -0800)]
Merge pull request #1310 from pallets/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
David Lord [Sun, 31 Jan 2021 07:07:30 +0000 (23:07 -0800)]
fix new formatting issues
pre-commit-ci[bot] [Mon, 25 Jan 2021 16:41:12 +0000 (16:41 +0000)]
[pre-commit.ci] pre-commit autoupdate
David Lord [Sun, 31 Jan 2021 06:55:14 +0000 (22:55 -0800)]
Merge pull request #1195 from bebleo/add_mailto_link_support
Improve and extend urlize
David Lord [Sun, 31 Jan 2021 06:19:54 +0000 (22:19 -0800)]
refactor urlize function
don't try other url types if one already matched
no-op function if trim is not enabled
avoid backtracking when matching trailing punctuation
match head and tail punctuation separately
don't scan for unbalanced parentheses more than necessary
ensure email domain starts and ends with a word character
sixtyfathoms [Sun, 31 Jan 2021 00:20:26 +0000 (14:20 -1000)]
update docs on adding extensions (#1237)
David Lord [Sat, 30 Jan 2021 21:23:04 +0000 (13:23 -0800)]
update urlize docs, clean up code
move regexes near implementation
commented verbose regex for http pattern
renamed extra_uri_schemes to extra_schemes
Roy Smith [Sat, 30 Jan 2021 15:53:38 +0000 (10:53 -0500)]
Improve diction (amount -> number) (#1341)
Bebleo [Sun, 19 Apr 2020 09:42:12 +0000 (05:42 -0400)]
Improve and extend urlize
David Lord [Sat, 30 Jan 2021 13:47:23 +0000 (05:47 -0800)]
update docs about required blocks (#1340)
Amy Lei [Sat, 30 Jan 2021 03:17:45 +0000 (22:17 -0500)]
Merge pull request #1243 from MLH-Fellowship/deprecate-extension
deprecate 'autoescape' and 'with' extensions for removal in 3.1
FawziyahAlebiosu [Thu, 18 Jun 2020 20:06:46 +0000 (16:06 -0400)]
deprecate 'with' and 'autoescape' extensions
Amy Lei [Fri, 29 Jan 2021 15:36:54 +0000 (10:36 -0500)]
Merge pull request #1233 from MLH-Fellowship/required-blocks
add required attribute to blocks
Amy [Wed, 10 Jun 2020 20:09:09 +0000 (16:09 -0400)]
add required attribute to blocks
required blocks must be overridden at some point, although not
necessarily by the direct child template
David Lord [Thu, 28 Jan 2021 14:19:59 +0000 (06:19 -0800)]
Merge pull request #1339 from mkrizek/issue-1335
native_concat: pass only strings to literal_eval
Martin Krizek [Thu, 28 Jan 2021 09:08:50 +0000 (10:08 +0100)]
native_concat: pass only strings to literal_eval
If there is only single node and it is not a string, there is no point
in passing it into ``literal_eval``, just return it immediately.
One of the examples where passing a non-string node into
``literal_eval`` would actually cause problems is when the node is
``Undefined``. On Python 3.10 this would cause ``UndefinedError``
instead of just ``Undefined`` being returned.
Fixes #1335
Adam Johnson [Tue, 26 Jan 2021 13:38:00 +0000 (13:38 +0000)]
Fix "If" example in documentation (#1337)
Fix "If" example in documentation
Thomas Moschny [Tue, 19 Jan 2021 20:01:18 +0000 (21:01 +0100)]
add 'linetable' to the preserved CodeType attributes (#1334)
add 'linetable' to the preserved CodeType attributes
co_linetable replaces co_lnotab as part of PEP 626 in Python 3.10.
dependabot-preview[bot] [Fri, 1 Jan 2021 08:39:58 +0000 (08:39 +0000)]
Merge pull request #1329 from pallets/dependabot/pip/pytest-6.2.1
dependabot-preview[bot] [Fri, 1 Jan 2021 08:35:39 +0000 (08:35 +0000)]
Bump pytest from 6.1.2 to 6.2.1
Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.1.2 to 6.2.1.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.1.2...6.2.1)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Fri, 1 Jan 2021 08:34:04 +0000 (08:34 +0000)]
Merge pull request #1330 from pallets/dependabot/pip/pre-commit-2.9.3
dependabot-preview[bot] [Fri, 1 Jan 2021 08:31:30 +0000 (08:31 +0000)]
Bump pre-commit from 2.9.2 to 2.9.3
Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.9.2 to 2.9.3.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pre-commit/pre-commit/compare/v2.9.2...v2.9.3)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Fri, 1 Jan 2021 08:29:58 +0000 (08:29 +0000)]
Merge pull request #1328 from pallets/dependabot/pip/pip-tools-5.5.0
dependabot-preview[bot] [Fri, 1 Jan 2021 08:28:10 +0000 (08:28 +0000)]
Bump pip-tools from 5.4.0 to 5.5.0
Bumps [pip-tools](https://github.com/jazzband/pip-tools) from 5.4.0 to 5.5.0.
- [Release notes](https://github.com/jazzband/pip-tools/releases)
- [Changelog](https://github.com/jazzband/pip-tools/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jazzband/pip-tools/compare/5.4.0...5.5.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Jonathan Berger [Wed, 23 Dec 2020 12:53:08 +0000 (04:53 -0800)]
Update templates.rst to fix small typo (#1327)
dependabot-preview[bot] [Tue, 1 Dec 2020 09:07:37 +0000 (09:07 +0000)]
Merge pull request #1322 from pallets/dependabot/pip/pre-commit-2.9.2
dependabot-preview[bot] [Tue, 1 Dec 2020 08:59:12 +0000 (08:59 +0000)]
Merge pull request #1321 from pallets/dependabot/pip/babel-2.9.0
dependabot-preview[bot] [Tue, 1 Dec 2020 08:59:04 +0000 (08:59 +0000)]
Bump pre-commit from 2.8.2 to 2.9.2
Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.8.2 to 2.9.2.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pre-commit/pre-commit/compare/v2.8.2...v2.9.2)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Tue, 1 Dec 2020 08:57:25 +0000 (08:57 +0000)]
Merge pull request #1320 from pallets/dependabot/pip/pip-tools-5.4.0
dependabot-preview[bot] [Tue, 1 Dec 2020 08:53:45 +0000 (08:53 +0000)]
Bump babel from 2.8.0 to 2.9.0
Bumps [babel](https://github.com/python-babel/babel) from 2.8.0 to 2.9.0.
- [Release notes](https://github.com/python-babel/babel/releases)
- [Changelog](https://github.com/python-babel/babel/blob/master/CHANGES)
- [Commits](https://github.com/python-babel/babel/commits)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Tue, 1 Dec 2020 08:53:04 +0000 (08:53 +0000)]
Bump pip-tools from 5.3.1 to 5.4.0
Bumps [pip-tools](https://github.com/jazzband/pip-tools) from 5.3.1 to 5.4.0.
- [Release notes](https://github.com/jazzband/pip-tools/releases)
- [Changelog](https://github.com/jazzband/pip-tools/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jazzband/pip-tools/compare/5.3.1...5.4.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>