]> git.ipfire.org Git - thirdparty/jinja.git/log
thirdparty/jinja.git
3 years agorelease version 3.1.1 1639/head
David Lord [Fri, 25 Mar 2022 22:27:45 +0000 (15:27 -0700)] 
release version 3.1.1

3 years agoMerge pull request #1638 from pallets/windows-altsep
David Lord [Fri, 25 Mar 2022 22:26:46 +0000 (15:26 -0700)] 
Merge pull request #1638 from pallets/windows-altsep

normpath on final template filename

3 years agonormpath on final template filename 1638/head
David Lord [Fri, 25 Mar 2022 22:10:18 +0000 (15:10 -0700)] 
normpath on final template filename

3 years agostart version 3.1.1
David Lord [Fri, 25 Mar 2022 22:05:58 +0000 (15:05 -0700)] 
start version 3.1.1

3 years agoMerge pull request #1625 from pallets/release-3.1.0 3.1.0
David Lord [Thu, 24 Mar 2022 14:12:26 +0000 (07:12 -0700)] 
Merge pull request #1625 from pallets/release-3.1.0

release version 3.1.0

3 years agorelease version 3.1.0 1625/head
David Lord [Thu, 24 Mar 2022 14:10:11 +0000 (07:10 -0700)] 
release version 3.1.0

3 years agoMerge pull request #1621 from pallets/template-safe-path
David Lord [Tue, 15 Mar 2022 21:01:58 +0000 (14:01 -0700)] 
Merge pull request #1621 from pallets/template-safe-path

use `posixpath.join` when loading template names

3 years agouse `posixpath.join` when loading template names 1621/head
David Lord [Tue, 15 Mar 2022 19:11:30 +0000 (12:11 -0700)] 
use `posixpath.join` when loading template names

3 years agoMerge pull request #1620 from janfilips/patch-1
David Lord [Tue, 15 Mar 2022 14:01:35 +0000 (07:01 -0700)] 
Merge pull request #1620 from janfilips/patch-1

Fix formatting in tricks.rst

3 years agoFix formatting in tricks.rst 1620/head
Jan Filips [Tue, 15 Mar 2022 13:56:40 +0000 (15:56 +0200)] 
Fix formatting in tricks.rst

3 years agoMerge pull request #1617 from pallets/docs-prose
David Lord [Sat, 12 Mar 2022 16:55:57 +0000 (08:55 -0800)] 
Merge pull request #1617 from pallets/docs-prose

rewrite non-technical documentation

3 years agorewrite include statement section 1617/head
David Lord [Sat, 12 Mar 2022 16:48:32 +0000 (08:48 -0800)] 
rewrite include statement section

3 years agoclean up faq, move technical discussions
David Lord [Sat, 12 Mar 2022 16:26:06 +0000 (08:26 -0800)] 
clean up faq, move technical discussions

3 years agoclean up engine comparisons
David Lord [Sat, 12 Mar 2022 15:50:49 +0000 (07:50 -0800)] 
clean up engine comparisons

3 years agoadd flask and django integration
David Lord [Sat, 12 Mar 2022 15:50:29 +0000 (07:50 -0800)] 
add flask and django integration

3 years agoMerge pull request #1616 from pallets/docs-sandbox
David Lord [Sat, 12 Mar 2022 14:43:34 +0000 (06:43 -0800)] 
Merge pull request #1616 from pallets/docs-sandbox

rewrite sandbox docs, add more security discussion

3 years agorewrite sandbox docs, add more security discussion 1616/head
David Lord [Sat, 12 Mar 2022 14:39:31 +0000 (06:39 -0800)] 
rewrite sandbox docs, add more security discussion

3 years agoMerge branch '3.0.x'
David Lord [Fri, 11 Mar 2022 22:38:25 +0000 (14:38 -0800)] 
Merge branch '3.0.x'

3 years agoMerge branch '2.11.x' into 3.0.x 3.0.x
David Lord [Fri, 11 Mar 2022 22:37:22 +0000 (14:37 -0800)] 
Merge branch '2.11.x' into 3.0.x

3 years agoMerge branch '2.10.x' into 2.11.x 2.11.x
David Lord [Fri, 11 Mar 2022 22:26:34 +0000 (14:26 -0800)] 
Merge branch '2.10.x' into 2.11.x

3 years agoMerge branch '2.9.x' into 2.10.x 2.10.x
David Lord [Fri, 11 Mar 2022 22:22:45 +0000 (14:22 -0800)] 
Merge branch '2.9.x' into 2.10.x

3 years agouse current jinja for docs build 2.9.x
David Lord [Fri, 11 Mar 2022 17:46:22 +0000 (09:46 -0800)] 
use current jinja for docs build

3 years agoMerge pull request #1368 from mvolfik/refactor-regex
David Lord [Tue, 8 Mar 2022 15:09:31 +0000 (07:09 -0800)] 
Merge pull request #1368 from mvolfik/refactor-regex

Re-use existing regex for whitespace detection

3 years agoRe-use existing regex for whitespace detection 1368/head
Matěj Volf [Wed, 10 Mar 2021 17:07:44 +0000 (18:07 +0100)] 
Re-use existing regex for whitespace detection

Whitespace regex could also detect newlines, but since we're only
matching the part from last newline, it's safer (and more readable)
to use it here.

3 years agoMerge pull request #1465 from wombatonfire/groupby-case-sensitive
David Lord [Tue, 8 Mar 2022 14:57:02 +0000 (06:57 -0800)] 
Merge pull request #1465 from wombatonfire/groupby-case-sensitive

Add case_sensitive parameter to groupby() filter

3 years agoadd case_sensitive parameter groupby filter 1465/head
David Lord [Mon, 14 Jun 2021 15:57:28 +0000 (18:57 +0300)] 
add case_sensitive parameter groupby filter

Co-authored-by: Yuri Sukhov <yuri.sukhov@gmail.com>
3 years agoMerge pull request #1614 from pallets/async-env-filter
David Lord [Mon, 7 Mar 2022 17:36:04 +0000 (09:36 -0800)] 
Merge pull request #1614 from pallets/async-env-filter

add parens around `auto_await` for filters and calls

3 years agoadd parens around auto_await for filters and calls 1614/head
David Lord [Mon, 7 Mar 2022 17:14:21 +0000 (09:14 -0800)] 
add parens around auto_await for filters and calls

3 years agoMerge pull request #1564 from pallets/feature/pairs
David Lord [Mon, 7 Mar 2022 16:32:45 +0000 (08:32 -0800)] 
Merge pull request #1564 from pallets/feature/pairs

Added items filter

3 years agoadd items filter 1564/head
Armin Ronacher [Sat, 1 Jan 2022 21:19:24 +0000 (22:19 +0100)] 
add items filter

3 years agoMerge pull request #1613 from dairiki/bug.environment-not-pickleable
David Lord [Mon, 7 Mar 2022 15:56:46 +0000 (07:56 -0800)] 
Merge pull request #1613 from dairiki/bug.environment-not-pickleable

3 years agoasync_variant filters are pickleable 1613/head
Jeff Dairiki [Thu, 3 Mar 2022 20:41:35 +0000 (12:41 -0800)] 
async_variant filters are pickleable

3 years agoMerge pull request #1607 from pallets/dependabot/github_actions/actions/setup-python-3
David Lord [Tue, 1 Mar 2022 16:48:27 +0000 (08:48 -0800)] 
Merge pull request #1607 from pallets/dependabot/github_actions/actions/setup-python-3

Bump actions/setup-python from 2 to 3

3 years agoBump actions/setup-python from 2 to 3 1607/head
dependabot[bot] [Tue, 1 Mar 2022 16:04:23 +0000 (16:04 +0000)] 
Bump actions/setup-python from 2 to 3

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 3.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoMerge branch '3.0.x'
David Lord [Fri, 18 Feb 2022 15:14:18 +0000 (07:14 -0800)] 
Merge branch '3.0.x'

3 years agoMerge pull request #1579 from simonw/patch-1
David Lord [Fri, 18 Feb 2022 15:08:03 +0000 (07:08 -0800)] 
Merge pull request #1579 from simonw/patch-1

get_template() uses / separators even on Windows

3 years agoget_template() uses / separators even on Windows 1579/head
Simon Willison [Thu, 3 Feb 2022 02:05:43 +0000 (18:05 -0800)] 
get_template() uses / separators even on Windows

Refs #1572

3 years agounpin pytest
David Lord [Fri, 18 Feb 2022 01:05:05 +0000 (17:05 -0800)] 
unpin pytest

3 years agoMerge branch '3.0.x'
David Lord [Fri, 18 Feb 2022 01:04:40 +0000 (17:04 -0800)] 
Merge branch '3.0.x'

3 years agoMerge pull request #1584 from pallets/update-requirements
David Lord [Fri, 18 Feb 2022 01:04:14 +0000 (17:04 -0800)] 
Merge pull request #1584 from pallets/update-requirements

update requirements

3 years agostop using dependabot for python, too noisy 1584/head
David Lord [Fri, 18 Feb 2022 00:58:26 +0000 (16:58 -0800)] 
stop using dependabot for python, too noisy

3 years agocache pip with setup-python action
David Lord [Fri, 18 Feb 2022 00:58:13 +0000 (16:58 -0800)] 
cache pip with setup-python action

3 years agouse pip-compile-multi for requirements
David Lord [Fri, 18 Feb 2022 00:55:58 +0000 (16:55 -0800)] 
use pip-compile-multi for requirements

3 years agoupdate pre-commit hooks
David Lord [Fri, 18 Feb 2022 00:53:43 +0000 (16:53 -0800)] 
update pre-commit hooks

3 years agoMerge pull request #1574 from adamchainz/docs_html
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

3 years agoUpdate legacy doctype in docs/tricks 1574/head
Adam Johnson [Wed, 26 Jan 2022 16:18:52 +0000 (16:18 +0000)] 
Update legacy doctype in docs/tricks

3 years agoMerge pull request #1571 from pallets/python3.7-identifier-pattern
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

3 years agoupdate identifier pattern for Python 3.7 1571/head
David Lord [Thu, 13 Jan 2022 22:57:21 +0000 (14:57 -0800)] 
update identifier pattern for Python 3.7

3 years agoMerge branch '3.0.x'
David Lord [Thu, 13 Jan 2022 22:46:46 +0000 (14:46 -0800)] 
Merge branch '3.0.x'

3 years agoupdate tool config
David Lord [Thu, 13 Jan 2022 22:45:55 +0000 (14:45 -0800)] 
update tool config

3 years agoMerge branch '3.0.x'
David Lord [Wed, 12 Jan 2022 19:47:49 +0000 (11:47 -0800)] 
Merge branch '3.0.x'

3 years agoMerge pull request #1570 from pallets/update-requirements
David Lord [Wed, 12 Jan 2022 19:47:32 +0000 (11:47 -0800)] 
Merge pull request #1570 from pallets/update-requirements

update requirements

3 years agoupdate requirements 1570/head
David Lord [Wed, 12 Jan 2022 19:40:58 +0000 (11:40 -0800)] 
update requirements

3 years agoMerge remote-tracking branch 'origin/3.0.x'
David Lord [Sun, 26 Dec 2021 23:18:33 +0000 (16:18 -0700)] 
Merge remote-tracking branch 'origin/3.0.x'

3 years agoMerge pull request #1560 from pallets/update-tools
David Lord [Sun, 26 Dec 2021 23:17:10 +0000 (16:17 -0700)] 
Merge pull request #1560 from pallets/update-tools

update tools

3 years agopin os and python version in rtd build 1560/head
David Lord [Sun, 26 Dec 2021 23:10:04 +0000 (16:10 -0700)] 
pin os and python version in rtd build

3 years agoupdate option names for v3
David Lord [Sun, 26 Dec 2021 23:07:23 +0000 (16:07 -0700)] 
update option names for v3

3 years agoupdates go to maintenance branch
David Lord [Sun, 26 Dec 2021 23:05:29 +0000 (16:05 -0700)] 
updates go to maintenance branch

3 years agoMerge pull request #1559 from pallets/i18n-context-block
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

3 years agospecify context for translation block 1559/head
David Lord [Sun, 26 Dec 2021 18:29:39 +0000 (11:29 -0700)] 
specify context for translation block

3 years agoMerge branch '3.0.x'
David Lord [Sun, 26 Dec 2021 14:48:45 +0000 (07:48 -0700)] 
Merge branch '3.0.x'

3 years agoMerge pull request #1558 from pallets:update-requirements
David Lord [Sun, 26 Dec 2021 14:44:17 +0000 (07:44 -0700)] 
Merge pull request #1558 from pallets:update-requirements

update requirements

3 years agofix new mypy findings 1558/head
David Lord [Sun, 26 Dec 2021 14:39:10 +0000 (07:39 -0700)] 
fix new mypy findings

3 years agoupdate requirements
David Lord [Sun, 26 Dec 2021 14:38:45 +0000 (07:38 -0700)] 
update requirements

3 years agoMerge pull request #1557 from bzinberg/patch-1
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)

3 years agoTypo in docs (trailing backtick) 1557/head
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:

3 years agoMerge pull request #1548 from mabdelaal86/patch-1
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

3 years agoFix little typo in docstring 1548/head
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.

3 years agoMerge pull request #1511 from mkrizek/issue-1510
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

3 years agosupport native types in macros 1511/head
Martin Krizek [Wed, 13 Oct 2021 14:56:48 +0000 (16:56 +0200)] 
support native types in macros

3 years agoMerge pull request #1544 from pallets/remove-deprecated-code
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

3 years agoupdate docs requirements 1544/head
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

3 years agoremove deprecated unicode_urlencode
David Lord [Tue, 9 Nov 2021 20:52:27 +0000 (12:52 -0800)] 
remove deprecated unicode_urlencode

3 years agoremove deprecated legacy resolve mode for context subclass
David Lord [Tue, 9 Nov 2021 20:50:28 +0000 (12:50 -0800)] 
remove deprecated legacy resolve mode for context subclass

3 years agoremove deprecated unicode_join runtime alias
David Lord [Tue, 9 Nov 2021 20:46:20 +0000 (12:46 -0800)] 
remove deprecated unicode_join runtime alias

3 years agoremove deprecated Markup and escape aliases
David Lord [Tue, 9 Nov 2021 20:44:30 +0000 (12:44 -0800)] 
remove deprecated Markup and escape aliases

3 years agoremove deprecated template function decorators
David Lord [Tue, 9 Nov 2021 20:42:59 +0000 (12:42 -0800)] 
remove deprecated template function decorators

3 years agoremove deprecated extensions
David Lord [Tue, 9 Nov 2021 20:37:01 +0000 (12:37 -0800)] 
remove deprecated extensions

3 years agoMerge branch '3.0.x'
David Lord [Tue, 9 Nov 2021 20:28:39 +0000 (12:28 -0800)] 
Merge branch '3.0.x'

3 years agoMerge pull request #1543 from pallets/release-3.0.3 3.0.3
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

3 years agorelease version 3.0.3 1543/head
David Lord [Tue, 9 Nov 2021 20:22:19 +0000 (12:22 -0800)] 
release version 3.0.3

3 years agoMerge pull request #1542 from pallets/package-loader-file
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

3 years agoPackageLoader works with single module file 1542/head
David Lord [Tue, 9 Nov 2021 20:14:48 +0000 (12:14 -0800)] 
PackageLoader works with single module file

3 years agoMerge pull request #1541 from pallets/docs-pow-order
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

3 years agodocument chained pow order 1541/head
David Lord [Tue, 9 Nov 2021 18:50:35 +0000 (10:50 -0800)] 
document chained pow order

3 years agoMerge pull request #1540 from pallets/docs-macro-defaults
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

3 years agorewrite docs about extending template objects 1540/head
David Lord [Tue, 9 Nov 2021 18:32:06 +0000 (10:32 -0800)] 
rewrite docs about extending template objects

3 years agoMerge pull request #1539 from pallets/docs-macro-defaults
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

3 years agoremove reference to macro.defaults 1539/head
David Lord [Tue, 9 Nov 2021 18:13:10 +0000 (10:13 -0800)] 
remove reference to macro.defaults

3 years agoMerge pull request #1538 from pallets/docs-template
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

3 years agorewrite Template class doc 1538/head
David Lord [Tue, 9 Nov 2021 18:05:35 +0000 (10:05 -0800)] 
rewrite Template class doc

3 years agoMerge pull request #1509 from kianmeng/fix-typos
David Lord [Tue, 9 Nov 2021 17:17:51 +0000 (09:17 -0800)] 
Merge pull request #1509 from kianmeng/fix-typos

Fix typos

3 years agoMerge pull request #1522 from klette/fix-node-hash
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__`

3 years agoUse object.__hash__ for Node.__hash__ 1522/head
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.

3 years agoMerge pull request #1516 from mohd-akram/async-perf
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

3 years agoReduce async overhead due to auto_await 1516/head
Mohamed Akram [Mon, 18 Oct 2021 19:58:54 +0000 (23:58 +0400)] 
Reduce async overhead due to auto_await

3 years agoMerge pull request #1537 from mkrizek/literal_eval-py-310
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

3 years agonative: keep same behavior on Python 3.10 1537/head
Martin Krizek [Tue, 9 Nov 2021 16:15:31 +0000 (17:15 +0100)] 
native: keep same behavior on Python 3.10

3 years agoMerge pull request #1536 from pallets/traceback-codetype
David Lord [Tue, 9 Nov 2021 16:27:21 +0000 (08:27 -0800)] 
Merge pull request #1536 from pallets/traceback-codetype

simplify CodeType rewriting

3 years agosimplify CodeType rewriting 1536/head
David Lord [Tue, 9 Nov 2021 15:10:53 +0000 (07:10 -0800)] 
simplify CodeType rewriting