]> git.ipfire.org Git - thirdparty/jinja.git/log
thirdparty/jinja.git
5 years agoBump pytest from 5.4.3 to 6.0.0 1267/head
dependabot-preview[bot] [Wed, 29 Jul 2020 08:23:17 +0000 (08:23 +0000)] 
Bump pytest from 5.4.3 to 6.0.0

Bumps [pytest](https://github.com/pytest-dev/pytest) from 5.4.3 to 6.0.0.
- [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/5.4.3...6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years agoMerge pull request #1266 from pallets/dependabot/pip/pip-tools-5.3.0
dependabot-preview[bot] [Mon, 27 Jul 2020 08:42:27 +0000 (08:42 +0000)] 
Merge pull request #1266 from pallets/dependabot/pip/pip-tools-5.3.0

5 years agoBump pip-tools from 5.2.1 to 5.3.0 1266/head
dependabot-preview[bot] [Mon, 27 Jul 2020 08:39:11 +0000 (08:39 +0000)] 
Bump pip-tools from 5.2.1 to 5.3.0

Bumps [pip-tools](https://github.com/jazzband/pip-tools) from 5.2.1 to 5.3.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.2.1...5.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years agoMerge pull request #1263 from pallets/dependabot/pip/tox-3.18.0
dependabot-preview[bot] [Fri, 24 Jul 2020 08:05:42 +0000 (08:05 +0000)] 
Merge pull request #1263 from pallets/dependabot/pip/tox-3.18.0

5 years agoBump tox from 3.17.1 to 3.18.0 1263/head
dependabot-preview[bot] [Fri, 24 Jul 2020 08:03:23 +0000 (08:03 +0000)] 
Bump tox from 3.17.1 to 3.18.0

Bumps [tox](https://github.com/tox-dev/tox) from 3.17.1 to 3.18.0.
- [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.17.1...3.18.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years agoMerge pull request #1260 from pallets/dependabot/pip/tox-3.17.1
dependabot-preview[bot] [Thu, 16 Jul 2020 08:25:22 +0000 (08:25 +0000)] 
Merge pull request #1260 from pallets/dependabot/pip/tox-3.17.1

5 years agoBump tox from 3.17.0 to 3.17.1 1260/head
dependabot-preview[bot] [Thu, 16 Jul 2020 08:23:28 +0000 (08:23 +0000)] 
Bump tox from 3.17.0 to 3.17.1

Bumps [tox](https://github.com/tox-dev/tox) from 3.17.0 to 3.17.1.
- [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.17.0...3.17.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years agoMerge pull request #1259 from pallets/dependabot/pip/tox-3.17.0
dependabot-preview[bot] [Wed, 15 Jul 2020 08:14:33 +0000 (08:14 +0000)] 
Merge pull request #1259 from pallets/dependabot/pip/tox-3.17.0

5 years agoBump tox from 3.16.1 to 3.17.0 1259/head
dependabot-preview[bot] [Wed, 15 Jul 2020 08:11:18 +0000 (08:11 +0000)] 
Bump tox from 3.16.1 to 3.17.0

Bumps [tox](https://github.com/tox-dev/tox) from 3.16.1 to 3.17.0.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/3.17.0/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/3.16.1...3.17.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years agoMerge pull request #1254 from pallets/dependabot/pip/pre-commit-2.6.0
dependabot-preview[bot] [Thu, 2 Jul 2020 08:24:30 +0000 (08:24 +0000)] 
Merge pull request #1254 from pallets/dependabot/pip/pre-commit-2.6.0

5 years agoBump pre-commit from 2.5.1 to 2.6.0 1254/head
dependabot-preview[bot] [Thu, 2 Jul 2020 08:21:16 +0000 (08:21 +0000)] 
Bump pre-commit from 2.5.1 to 2.6.0

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.5.1 to 2.6.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.5.1...v2.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years agomove metadata to setup.cfg
David Lord [Wed, 1 Jul 2020 16:33:03 +0000 (09:33 -0700)] 
move metadata to setup.cfg

5 years agoMerge pull request #1251 from pallets/dependabot/pip/tox-3.16.1
dependabot-preview[bot] [Tue, 30 Jun 2020 08:16:21 +0000 (08:16 +0000)] 
Merge pull request #1251 from pallets/dependabot/pip/tox-3.16.1

5 years agoBump tox from 3.16.0 to 3.16.1 1251/head
dependabot-preview[bot] [Tue, 30 Jun 2020 08:14:02 +0000 (08:14 +0000)] 
Bump tox from 3.16.0 to 3.16.1

Bumps [tox](https://github.com/tox-dev/tox) from 3.16.0 to 3.16.1.
- [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.16.0...3.16.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years agoMerge pull request #1250 from pallets/dependabot/pip/tox-3.16.0
dependabot-preview[bot] [Mon, 29 Jun 2020 08:42:05 +0000 (08:42 +0000)] 
Merge pull request #1250 from pallets/dependabot/pip/tox-3.16.0

5 years agoBump tox from 3.15.2 to 3.16.0 1250/head
dependabot-preview[bot] [Mon, 29 Jun 2020 08:40:10 +0000 (08:40 +0000)] 
Bump tox from 3.15.2 to 3.16.0

Bumps [tox](https://github.com/tox-dev/tox) from 3.15.2 to 3.16.0.
- [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.15.2...3.16.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years agoMerge pull request #1240 from MLH-Fellowship/ignore-trim-blocks
David Lord [Mon, 22 Jun 2020 17:34:40 +0000 (10:34 -0700)] 
Merge pull request #1240 from MLH-Fellowship/ignore-trim-blocks

Allow +%} to ignore trim_blocks

5 years agoignore trim_blocks using '+%}' 1240/head
Amy [Wed, 17 Jun 2020 18:12:57 +0000 (14:12 -0400)] 
ignore trim_blocks using '+%}'

5 years agoMerge pull request #1241 from MLH-Fellowship/macros_with_globals
David Lord [Mon, 22 Jun 2020 17:12:46 +0000 (10:12 -0700)] 
Merge pull request #1241 from MLH-Fellowship/macros_with_globals

Fix bug with imported macros and template globals

5 years agoimported templates can see the current globals 1241/head
Amy [Mon, 22 Jun 2020 13:54:08 +0000 (09:54 -0400)] 
imported templates can see the current globals

_get_default_module takes an optional context to indicate that the
template is imported. If there are differences between the environment
and rendered template globals, a new module is used for the imported
template.

5 years agoadd more tests for import context behavior
Amy [Fri, 19 Jun 2020 15:53:29 +0000 (11:53 -0400)] 
add more tests for import context behavior

5 years agoMerge pull request #1238 from MLH-Fellowship/1197-sandbox
David Lord [Mon, 15 Jun 2020 18:08:47 +0000 (11:08 -0700)] 
Merge pull request #1238 from MLH-Fellowship/1197-sandbox

Remove sandbox Python < 3.5 compat

5 years agoremove sandbox._MagicFormatMapping 1238/head
Amy [Mon, 15 Jun 2020 17:39:33 +0000 (13:39 -0400)] 
remove sandbox._MagicFormatMapping

add test for escape formatter

5 years agoadd contributing guide
David Lord [Fri, 12 Jun 2020 02:43:50 +0000 (19:43 -0700)] 
add contributing guide

5 years agoMerge pull request #1232 from pallets/dependabot/pip/pre-commit-2.5.1
dependabot-preview[bot] [Wed, 10 Jun 2020 08:51:10 +0000 (08:51 +0000)] 
Merge pull request #1232 from pallets/dependabot/pip/pre-commit-2.5.1

5 years agoBump pre-commit from 2.5.0 to 2.5.1 1232/head
dependabot-preview[bot] [Wed, 10 Jun 2020 08:48:22 +0000 (08:48 +0000)] 
Bump pre-commit from 2.5.0 to 2.5.1

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.5.0 to 2.5.1.
- [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.5.0...v2.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years agoMerge pull request #1231 from pallets/dependabot/pip/pip-tools-5.2.1
dependabot-preview[bot] [Wed, 10 Jun 2020 08:46:42 +0000 (08:46 +0000)] 
Merge pull request #1231 from pallets/dependabot/pip/pip-tools-5.2.1

5 years agoBump pip-tools from 5.2.0 to 5.2.1 1231/head
dependabot-preview[bot] [Wed, 10 Jun 2020 08:44:49 +0000 (08:44 +0000)] 
Bump pip-tools from 5.2.0 to 5.2.1

Bumps [pip-tools](https://github.com/jazzband/pip-tools) from 5.2.0 to 5.2.1.
- [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.2.0...5.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years agoMerge pull request #1230 from pallets/dependabot/pip/pre-commit-2.5.0
dependabot-preview[bot] [Tue, 9 Jun 2020 08:24:18 +0000 (08:24 +0000)] 
Merge pull request #1230 from pallets/dependabot/pip/pre-commit-2.5.0

5 years agoBump pre-commit from 2.4.0 to 2.5.0 1230/head
dependabot-preview[bot] [Tue, 9 Jun 2020 08:21:54 +0000 (08:21 +0000)] 
Bump pre-commit from 2.4.0 to 2.5.0

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.4.0 to 2.5.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.4.0...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years agoMerge pull request #1229 from pallets/dependabot/pip/tox-3.15.2
dependabot-preview[bot] [Mon, 8 Jun 2020 14:14:06 +0000 (14:14 +0000)] 
Merge pull request #1229 from pallets/dependabot/pip/tox-3.15.2

5 years agoBump tox from 3.15.1 to 3.15.2 1229/head
dependabot-preview[bot] [Mon, 8 Jun 2020 08:44:54 +0000 (08:44 +0000)] 
Bump tox from 3.15.1 to 3.15.2

Bumps [tox](https://github.com/tox-dev/tox) from 3.15.1 to 3.15.2.
- [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.15.1...3.15.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years agoMerge pull request #1228 from pallets/dependabot/pip/pytest-5.4.3
David Lord [Wed, 3 Jun 2020 14:45:28 +0000 (07:45 -0700)] 
Merge pull request #1228 from pallets/dependabot/pip/pytest-5.4.3

Bump pytest from 5.4.2 to 5.4.3

5 years agoBump pytest from 5.4.2 to 5.4.3 1228/head
dependabot-preview[bot] [Wed, 3 Jun 2020 08:52:31 +0000 (08:52 +0000)] 
Bump pytest from 5.4.2 to 5.4.3

Bumps [pytest](https://github.com/pytest-dev/pytest) from 5.4.2 to 5.4.3.
- [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/5.4.2...5.4.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years agoBump pip-tools from 5.1.2 to 5.2.0 (#1227)
dependabot-preview[bot] [Thu, 28 May 2020 15:53:45 +0000 (08:53 -0700)] 
Bump pip-tools from 5.1.2 to 5.2.0 (#1227)

Bumps [pip-tools](https://github.com/jazzband/pip-tools) from 5.1.2 to 5.2.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.1.2...5.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoadd EditorConfig
David Lord [Sat, 23 May 2020 20:23:49 +0000 (13:23 -0700)] 
add EditorConfig

5 years agoMerge pull request #1225 from pallets/github-actions
David Lord [Sat, 23 May 2020 20:05:13 +0000 (13:05 -0700)] 
Merge pull request #1225 from pallets/github-actions

use GitHub Actions for CI

5 years agouse GitHub Actions for CI 1225/head
David Lord [Sat, 23 May 2020 19:58:04 +0000 (12:58 -0700)] 
use GitHub Actions for CI

5 years agoMerge pull request #1224 from pallets/loader-docs
David Lord [Sat, 23 May 2020 19:30:50 +0000 (12:30 -0700)] 
Merge pull request #1224 from pallets/loader-docs

update package and filesystem loader docs

5 years agoupdate package and filesystem loader docs 1224/head
David Lord [Sat, 23 May 2020 19:21:34 +0000 (12:21 -0700)] 
update package and filesystem loader docs

5 years agoMerge pull request #1222 from pallets/dependabot/pip/tox-3.15.1
David Lord [Sat, 23 May 2020 18:13:46 +0000 (11:13 -0700)] 
Merge pull request #1222 from pallets/dependabot/pip/tox-3.15.1

Bump tox from 3.15.0 to 3.15.1

5 years agoBump tox from 3.15.0 to 3.15.1 1222/head
dependabot-preview[bot] [Sat, 23 May 2020 18:12:14 +0000 (18:12 +0000)] 
Bump tox from 3.15.0 to 3.15.1

Bumps [tox](https://github.com/tox-dev/tox) from 3.15.0 to 3.15.1.
- [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.15.0...3.15.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years agoMerge pull request #1221 from pallets/remove-docs-dev
David Lord [Sat, 23 May 2020 17:58:45 +0000 (10:58 -0700)] 
Merge pull request #1221 from pallets/remove-docs-dev

remove docs requirements from dev requirments

5 years agoremove docs requirements from dev requirments 1221/head
David Lord [Sat, 23 May 2020 17:45:23 +0000 (10:45 -0700)] 
remove docs requirements from dev requirments

otherwise Sphinx will cause Jinja to be pinned

5 years agotry another dependabot ignore pattern
David Lord [Mon, 18 May 2020 23:21:04 +0000 (16:21 -0700)] 
try another dependabot ignore pattern

5 years agotry another dependabot ignore pattern
David Lord [Mon, 18 May 2020 22:59:03 +0000 (15:59 -0700)] 
try another dependabot ignore pattern

5 years agofix dependabot config syntax
David Lord [Mon, 18 May 2020 22:56:23 +0000 (15:56 -0700)] 
fix dependabot config syntax

5 years agoMerge pull request #1216 from pallets/dependabot-config
David Lord [Mon, 18 May 2020 22:53:07 +0000 (15:53 -0700)] 
Merge pull request #1216 from pallets/dependabot-config

try to make dependabot ignore editable line

5 years agotry to make dependabot ignore editable line 1216/head
David Lord [Mon, 18 May 2020 22:49:08 +0000 (15:49 -0700)] 
try to make dependabot ignore editable line

5 years agoMerge pull request #1214 from pallets/requirements
David Lord [Mon, 18 May 2020 22:31:58 +0000 (15:31 -0700)] 
Merge pull request #1214 from pallets/requirements

use pip-compile to pin dev requirements

5 years agouse pip-compile to pin dev requirements 1214/head
David Lord [Mon, 18 May 2020 22:10:00 +0000 (15:10 -0700)] 
use pip-compile to pin dev requirements

5 years agoMerge pull request #1213 from pallets/rtd-config
David Lord [Mon, 18 May 2020 21:58:52 +0000 (14:58 -0700)] 
Merge pull request #1213 from pallets/rtd-config

add readthedocs config

5 years agoadd readthedocs config 1213/head
David Lord [Mon, 18 May 2020 21:56:41 +0000 (14:56 -0700)] 
add readthedocs config

5 years agoMerge pull request #1196 from pallets/remove-vim
David Lord [Sun, 19 Apr 2020 16:01:07 +0000 (09:01 -0700)] 
Merge pull request #1196 from pallets/remove-vim

remove vim syntax file

5 years agoremove vim syntax file 1196/head
David Lord [Sun, 19 Apr 2020 15:55:59 +0000 (08:55 -0700)] 
remove vim syntax file

remove unmaintained information from integration doc

5 years agoMerge branch '2.11.x'
David Lord [Mon, 13 Apr 2020 16:26:39 +0000 (09:26 -0700)] 
Merge branch '2.11.x'

5 years agofix changelog header
David Lord [Mon, 13 Apr 2020 16:20:59 +0000 (09:20 -0700)] 
fix changelog header

5 years agorelease version 2.11.2 2.11.2
David Lord [Mon, 13 Apr 2020 16:12:19 +0000 (09:12 -0700)] 
release version 2.11.2

5 years agoMerge pull request #1190 from pallets/native-eval
David Lord [Mon, 13 Apr 2020 15:56:37 +0000 (08:56 -0700)] 
Merge pull request #1190 from pallets/native-eval

native only evals at end of render

5 years agonative only evals at end of render 1190/head
David Lord [Mon, 13 Apr 2020 15:25:49 +0000 (08:25 -0700)] 
native only evals at end of render

Co-authored-by: Martin Krizek <mkrizek@redhat.com>
5 years agoMerge pull request #1183 from exponea/1138-fix-unintended-lstrip-behavior-change
David Lord [Mon, 13 Apr 2020 14:09:31 +0000 (07:09 -0700)] 
Merge pull request #1183 from exponea/1138-fix-unintended-lstrip-behavior-change

Fix unintended lstrip_blocks behavior

5 years agoAdd tests for lstrip whitespace behavior fix 1183/head
Peter Dolak [Fri, 3 Apr 2020 09:29:28 +0000 (11:29 +0200)] 
Add tests for lstrip whitespace behavior fix

Also did peformance tests for the previous fix and saw no measurable
impact.

5 years agoFix unintended lstrip_blocks behavior. Fixes #1138
Peter Dolak [Thu, 2 Apr 2020 14:55:57 +0000 (16:55 +0200)] 
Fix unintended lstrip_blocks behavior. Fixes #1138

Introduced in #858. Tests will follow, also results of performance
testing.

5 years agoDon't use setlocal in syntax file (#1164)
Ken Crowell [Sun, 12 Apr 2020 16:46:08 +0000 (13:46 -0300)] 
Don't use setlocal in syntax file (#1164)

I'm not 100% sure that one should not use `setlocal` in a syntax file,
but this breaks other filetypes that may include this syntax file, like
the vim-markdown plugin.  The `comments` and `commentstring` get set for
that markdown buffer with the jinja settings.

See
https://github.com/dhruvasagar/vim-table-mode/issues/162#issuecomment-595317626
for an example of side effects.

5 years agoUpdate oudated CutomLoader code example (#1185)
Xinbin Huang [Wed, 8 Apr 2020 20:15:30 +0000 (13:15 -0700)] 
Update oudated CutomLoader code example (#1185)

py3 for CustomLoader example

5 years agoMerge branch '2.11.x'
David Lord [Wed, 8 Apr 2020 15:53:28 +0000 (08:53 -0700)] 
Merge branch '2.11.x'

5 years agoMerge tag '2.11.1' into 2.11.x
David Lord [Wed, 8 Apr 2020 15:52:03 +0000 (08:52 -0700)] 
Merge tag '2.11.1' into 2.11.x

5 years agoMerge pull request #1169 from asottile/pep_451
David Lord [Mon, 30 Mar 2020 20:03:04 +0000 (13:03 -0700)] 
Merge pull request #1169 from asottile/pep_451

Use importlib machinery to fix PEP 451 import hooks

5 years agoadd changelog and cleanup for pep 451 support 1169/head
David Lord [Mon, 30 Mar 2020 19:55:40 +0000 (12:55 -0700)] 
add changelog and cleanup for pep 451 support

5 years agoUse importlib machinery to fix PEP 451 import hooks
Anthony Sottile [Tue, 10 Mar 2020 17:02:47 +0000 (10:02 -0700)] 
Use importlib machinery to fix PEP 451 import hooks

5 years agoMerge branch '2.11.x'
David Lord [Mon, 30 Mar 2020 18:40:59 +0000 (11:40 -0700)] 
Merge branch '2.11.x'

5 years agoMerge pull request #1181 from bartfeenstra/async-namespace
David Lord [Mon, 30 Mar 2020 18:34:13 +0000 (11:34 -0700)] 
Merge pull request #1181 from bartfeenstra/async-namespace

Allow namespaces to be used in asynchronously rendered templates.

5 years agonamespace object works in async templates 1181/head
Bart Feenstra [Sat, 28 Mar 2020 16:18:58 +0000 (16:18 +0000)] 
namespace object works in async templates

5 years agoMerge pull request #1178 from avli/fix-lexer-lineno
David Lord [Mon, 30 Mar 2020 18:23:11 +0000 (11:23 -0700)] 
Merge pull request #1178 from avli/fix-lexer-lineno

Fix tokens line number calculation when whitespace stripping is used

5 years agoFix tokens line number calculation when whitespace stripping is used 1178/head
Andrey Lisin [Fri, 27 Mar 2020 10:20:01 +0000 (13:20 +0300)] 
Fix tokens line number calculation when whitespace stripping is used

5 years agoMerge branch '2.11.x'
David Lord [Mon, 30 Mar 2020 17:54:57 +0000 (10:54 -0700)] 
Merge branch '2.11.x'

5 years agoMerge pull request #1182 from pallets/revert-package-loader
David Lord [Mon, 30 Mar 2020 17:34:13 +0000 (10:34 -0700)] 
Merge pull request #1182 from pallets/revert-package-loader

Revert dropping pkg_resources from PackageLoader for 2.11

5 years agochangelog for reverting PackageLoader changes 1182/head
David Lord [Mon, 30 Mar 2020 17:22:51 +0000 (10:22 -0700)] 
changelog for reverting PackageLoader changes

5 years agoRevert "PackageLoader doesn't depend on setuptools"
David Lord [Mon, 30 Mar 2020 17:11:22 +0000 (10:11 -0700)] 
Revert "PackageLoader doesn't depend on setuptools"

This reverts commit 4b6077a8c0a0f56bb8dbac37f8f9027130b4091c.

5 years agoRevert "PackageLoader understands namespace packages"
David Lord [Mon, 30 Mar 2020 16:55:51 +0000 (09:55 -0700)] 
Revert "PackageLoader understands namespace packages"

This reverts commit d2e0e78afe7c6ae864a20c2cc29e80936cff47af.

5 years agoMerge pull request #1179 from pallets/undefined-recursion
David Lord [Fri, 27 Mar 2020 17:05:12 +0000 (10:05 -0700)] 
Merge pull request #1179 from pallets/undefined-recursion

AttributeError in undefined message doesn't cause RuntimeError

5 years agoAttributeError in undefined message doesn't cause RuntimeError 1179/head
David Lord [Fri, 27 Mar 2020 16:51:53 +0000 (09:51 -0700)] 
AttributeError in undefined message doesn't cause RuntimeError

5 years agoMerge pull request #1174 from septatrix/patch-1
Joshua Bronson [Sun, 22 Mar 2020 17:28:57 +0000 (13:28 -0400)] 
Merge pull request #1174 from septatrix/patch-1

Fix html tag

5 years agoFix html tag 1174/head
Nils K [Sun, 22 Mar 2020 16:58:20 +0000 (17:58 +0100)] 
Fix html tag

5 years agoMerge pull request #1163 from pallets/traceback-32-bit
David Lord [Sat, 29 Feb 2020 03:08:10 +0000 (19:08 -0800)] 
Merge pull request #1163 from pallets/traceback-32-bit

better PyObject_HEAD size calculation

5 years agobetter PyObject_HEAD size calculation 1163/head
David Lord [Sat, 29 Feb 2020 02:50:00 +0000 (18:50 -0800)] 
better PyObject_HEAD size calculation

fixes infinite loop on Python 3.6 32-bit

5 years agoMerge pull request #1161 from ldealmei/patch-1
David Lord [Fri, 28 Feb 2020 16:02:50 +0000 (08:02 -0800)] 
Merge pull request #1161 from ldealmei/patch-1

Add link to template designer documentation

5 years agoAdd link to template designer documentation 1161/head
ldealmei [Fri, 28 Feb 2020 15:29:26 +0000 (16:29 +0100)] 
Add link to template designer documentation

For those who were actually looking for the template design documentation putting a link directly to it might prevent them to have to google for it. When on the API page, there is no direct way to find the template design documentation. Hope this can help others.

5 years agoMerge branch '2.11.x'
David Lord [Thu, 27 Feb 2020 19:16:01 +0000 (11:16 -0800)] 
Merge branch '2.11.x'

5 years agoMerge pull request #1160 from sivel/wordcount-soft-str
David Lord [Thu, 27 Feb 2020 19:10:31 +0000 (11:10 -0800)] 
Merge pull request #1160 from sivel/wordcount-soft-str

Use soft_str in do_wordcount, to trigger undefined

5 years agouse soft_str in do_wordcount, to trigger undefined 1160/head
Matt Martz [Thu, 27 Feb 2020 18:46:58 +0000 (12:46 -0600)] 
use soft_str in do_wordcount, to trigger undefined

5 years agoMerge pull request #1149 from davidbrochart/fix_doc
David Lord [Sat, 8 Feb 2020 19:12:55 +0000 (11:12 -0800)] 
Merge pull request #1149 from davidbrochart/fix_doc

5 years agorewrite async discussion 1149/head
David Lord [Sat, 8 Feb 2020 19:07:18 +0000 (11:07 -0800)] 
rewrite async discussion

5 years agoFix async doc
David Brochart [Fri, 7 Feb 2020 12:30:35 +0000 (13:30 +0100)] 
Fix async doc

5 years agoMerge branch '2.11.x'
David Lord [Thu, 6 Feb 2020 04:39:04 +0000 (20:39 -0800)] 
Merge branch '2.11.x'

5 years agoremove custom pytest marks
David Lord [Thu, 6 Feb 2020 04:23:47 +0000 (20:23 -0800)] 
remove custom pytest marks

5 years agofix formatting 3.0.0a1
David Lord [Wed, 5 Feb 2020 22:31:20 +0000 (14:31 -0800)] 
fix formatting

5 years agofix formatting
David Lord [Wed, 5 Feb 2020 22:29:52 +0000 (14:29 -0800)] 
fix formatting

5 years agoMerge pull request #1136 from pallets/drop-python2
David Lord [Wed, 5 Feb 2020 16:50:01 +0000 (08:50 -0800)] 
Merge pull request #1136 from pallets/drop-python2

Drop Python 2

5 years agoadd note about ugettext 1136/head
David Lord [Wed, 29 Jan 2020 14:17:56 +0000 (06:17 -0800)] 
add note about ugettext