]> git.ipfire.org Git - thirdparty/jinja.git/log
thirdparty/jinja.git
4 years ago[pre-commit.ci] pre-commit autoupdate 1351/head
pre-commit-ci[bot] [Mon, 8 Feb 2021 16:52:04 +0000 (16:52 +0000)] 
[pre-commit.ci] pre-commit autoupdate

4 years agoMerge pull request #1350 from pallets/update-test-requirements
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

4 years agoupdate requirements, test Python 3.9 1350/head
David Lord [Sun, 7 Feb 2021 04:35:29 +0000 (20:35 -0800)] 
update requirements, test Python 3.9

4 years agoupdate building docs instructions in contributing guide (#1235)
sixtyfathoms [Thu, 4 Feb 2021 16:02:48 +0000 (06:02 -1000)] 
update building docs instructions in contributing guide (#1235)

4 years agoupdate contributing guide
David Lord [Tue, 2 Feb 2021 17:52:15 +0000 (09:52 -0800)] 
update contributing guide

4 years agoMerge pull request #1348 from pallets/json-docs
David Lord [Tue, 2 Feb 2021 06:48:29 +0000 (22:48 -0800)] 
Merge pull request #1348 from pallets/json-docs

update tojson docs

4 years agoupdate tojson docs 1348/head
David Lord [Tue, 2 Feb 2021 06:35:43 +0000 (22:35 -0800)] 
update tojson docs

4 years ago[pre-commit.ci] pre-commit autoupdate (#1347)
pre-commit-ci[bot] [Mon, 1 Feb 2021 17:01:49 +0000 (09:01 -0800)] 
[pre-commit.ci] pre-commit autoupdate (#1347)

4 years agoMerge pull request #1346 from pallets/dependabot/pip/pytest-6.2.2
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

4 years agoMerge pull request #1345 from pallets/dependabot/pip/pre-commit-2.10.0
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

4 years agoBump pytest from 6.2.1 to 6.2.2 1346/head
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>
4 years agoBump pre-commit from 2.9.3 to 2.10.0 1345/head
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>
4 years agoMerge pull request #1344 from pallets/dependabot/pip/tox-3.21.3
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

4 years agoBump tox from 3.20.1 to 3.21.3 1344/head
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>
4 years agoMerge branch '2.11.x'
David Lord [Sun, 31 Jan 2021 16:48:44 +0000 (08:48 -0800)] 
Merge branch '2.11.x'

4 years agorelease version 2.11.3 2.11.3
David Lord [Sun, 31 Jan 2021 16:44:37 +0000 (08:44 -0800)] 
release version 2.11.3

4 years agoMerge pull request #1343 from pallets/urlize-speedup
David Lord [Sun, 31 Jan 2021 16:15:28 +0000 (08:15 -0800)] 
Merge pull request #1343 from pallets/urlize-speedup

backport urlize speedup

4 years agospeed up urlize matching 1343/head
David Lord [Sun, 31 Jan 2021 15:54:40 +0000 (07:54 -0800)] 
speed up urlize matching

4 years agoMerge pull request #1310 from pallets/pre-commit-ci-update-config
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

4 years agofix new formatting issues 1310/head
David Lord [Sun, 31 Jan 2021 07:07:30 +0000 (23:07 -0800)] 
fix new formatting issues

4 years ago[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] [Mon, 25 Jan 2021 16:41:12 +0000 (16:41 +0000)] 
[pre-commit.ci] pre-commit autoupdate

4 years agoMerge pull request #1195 from bebleo/add_mailto_link_support
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

4 years agorefactor urlize function 1195/head
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

4 years agoupdate docs on adding extensions (#1237)
sixtyfathoms [Sun, 31 Jan 2021 00:20:26 +0000 (14:20 -1000)] 
update docs on adding extensions (#1237)

4 years agoupdate urlize docs, clean up code
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

4 years agoImprove diction (amount -> number) (#1341)
Roy Smith [Sat, 30 Jan 2021 15:53:38 +0000 (10:53 -0500)] 
Improve diction (amount -> number) (#1341)

4 years agoImprove and extend urlize
Bebleo [Sun, 19 Apr 2020 09:42:12 +0000 (05:42 -0400)] 
Improve and extend urlize

4 years agoupdate docs about required blocks (#1340)
David Lord [Sat, 30 Jan 2021 13:47:23 +0000 (05:47 -0800)] 
update docs about required blocks (#1340)

4 years agoMerge pull request #1243 from MLH-Fellowship/deprecate-extension
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

4 years agodeprecate 'with' and 'autoescape' extensions 1243/head
FawziyahAlebiosu [Thu, 18 Jun 2020 20:06:46 +0000 (16:06 -0400)] 
deprecate 'with' and 'autoescape' extensions

4 years agoMerge pull request #1233 from MLH-Fellowship/required-blocks
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

4 years agoadd required attribute to blocks 1233/head
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

4 years agoMerge pull request #1339 from mkrizek/issue-1335
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

4 years agonative_concat: pass only strings to literal_eval 1339/head
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

4 years agoFix "If" example in documentation (#1337)
Adam Johnson [Tue, 26 Jan 2021 13:38:00 +0000 (13:38 +0000)] 
Fix "If" example in documentation (#1337)

Fix "If" example in documentation

4 years agoadd 'linetable' to the preserved CodeType attributes (#1334)
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.

4 years agoMerge pull request #1329 from pallets/dependabot/pip/pytest-6.2.1
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

4 years agoBump pytest from 6.1.2 to 6.2.1 1329/head
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>
4 years agoMerge pull request #1330 from pallets/dependabot/pip/pre-commit-2.9.3
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

4 years agoBump pre-commit from 2.9.2 to 2.9.3 1330/head
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>
4 years agoMerge pull request #1328 from pallets/dependabot/pip/pip-tools-5.5.0
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

4 years agoBump pip-tools from 5.4.0 to 5.5.0 1328/head
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>
4 years agoUpdate templates.rst to fix small typo (#1327)
Jonathan Berger [Wed, 23 Dec 2020 12:53:08 +0000 (04:53 -0800)] 
Update templates.rst to fix small typo (#1327)

4 years agoMerge pull request #1322 from pallets/dependabot/pip/pre-commit-2.9.2
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

4 years agoMerge pull request #1321 from pallets/dependabot/pip/babel-2.9.0
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

4 years agoBump pre-commit from 2.8.2 to 2.9.2 1322/head
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>
4 years agoMerge pull request #1320 from pallets/dependabot/pip/pip-tools-5.4.0
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

4 years agoBump babel from 2.8.0 to 2.9.0 1321/head
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>
4 years agoBump pip-tools from 5.3.1 to 5.4.0 1320/head
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>
4 years agoreduce lock schedule to daily
David Lord [Sat, 14 Nov 2020 00:27:25 +0000 (16:27 -0800)] 
reduce lock schedule to daily

4 years agoadd lock threads workflow
David Lord [Fri, 13 Nov 2020 19:39:21 +0000 (11:39 -0800)] 
add lock threads workflow

4 years agoMerge pull request #1306 from pallets/dependabot/pip/pre-commit-2.8.2
dependabot-preview[bot] [Sun, 1 Nov 2020 08:38:15 +0000 (08:38 +0000)] 
Merge pull request #1306 from pallets/dependabot/pip/pre-commit-2.8.2

4 years agoBump pre-commit from 2.7.1 to 2.8.2 1306/head
dependabot-preview[bot] [Sun, 1 Nov 2020 08:36:40 +0000 (08:36 +0000)] 
Bump pre-commit from 2.7.1 to 2.8.2

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.7.1 to 2.8.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.7.1...v2.8.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years agoMerge pull request #1307 from pallets/dependabot/pip/pytest-6.1.2
dependabot-preview[bot] [Sun, 1 Nov 2020 08:35:12 +0000 (08:35 +0000)] 
Merge pull request #1307 from pallets/dependabot/pip/pytest-6.1.2

4 years agoBump pytest from 6.1.0 to 6.1.2 1307/head
dependabot-preview[bot] [Sun, 1 Nov 2020 08:32:41 +0000 (08:32 +0000)] 
Bump pytest from 6.1.0 to 6.1.2

Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.1.0 to 6.1.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.1.0...6.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years agoMerge pull request #1305 from pallets/dependabot/pip/tox-3.20.1
dependabot-preview[bot] [Sun, 1 Nov 2020 08:31:03 +0000 (08:31 +0000)] 
Merge pull request #1305 from pallets/dependabot/pip/tox-3.20.1

4 years agoBump tox from 3.20.0 to 3.20.1 1305/head
dependabot-preview[bot] [Sun, 1 Nov 2020 08:27:16 +0000 (08:27 +0000)] 
Bump tox from 3.20.0 to 3.20.1

Bumps [tox](https://github.com/tox-dev/tox) from 3.20.0 to 3.20.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.20.0...3.20.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years agoMerge pull request #1303 from gibson042/gh-1279-custom-async-filters
David Lord [Sun, 1 Nov 2020 02:09:22 +0000 (19:09 -0700)] 
Merge pull request #1303 from gibson042/gh-1279-custom-async-filters

Fix custom async filters

4 years agodetect custom async filters in as_const 1303/head
Richard Gibson [Thu, 22 Oct 2020 23:26:01 +0000 (19:26 -0400)] 
detect custom async filters in as_const

4 years agoMerge pull request #1247 from MLH-Fellowship/type-hints
David Lord [Wed, 21 Oct 2020 13:05:09 +0000 (06:05 -0700)] 
Merge pull request #1247 from MLH-Fellowship/type-hints

Setup mypy

4 years agoMerge pull request #1296 from pallets/dependabot/pip/pytest-6.1.0
dependabot-preview[bot] [Thu, 1 Oct 2020 08:26:36 +0000 (08:26 +0000)] 
Merge pull request #1296 from pallets/dependabot/pip/pytest-6.1.0

4 years agoBump pytest from 6.0.2 to 6.1.0 1296/head
dependabot-preview[bot] [Thu, 1 Oct 2020 08:24:17 +0000 (08:24 +0000)] 
Bump pytest from 6.0.2 to 6.1.0

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

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years agoMerge pull request #1292 from pallets/dependabot/pip/pytest-6.0.2
dependabot-preview[bot] [Mon, 14 Sep 2020 08:21:28 +0000 (08:21 +0000)] 
Merge pull request #1292 from pallets/dependabot/pip/pytest-6.0.2

4 years agoBump pytest from 6.0.1 to 6.0.2 1292/head
dependabot-preview[bot] [Mon, 14 Sep 2020 08:18:41 +0000 (08:18 +0000)] 
Bump pytest from 6.0.1 to 6.0.2

Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.0.1 to 6.0.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.0.1...6.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years agoMerge pull request #1291 from pallets/dependabot/pip/tox-3.20.0
dependabot-preview[bot] [Mon, 7 Sep 2020 08:21:18 +0000 (08:21 +0000)] 
Merge pull request #1291 from pallets/dependabot/pip/tox-3.20.0

4 years agoBump tox from 3.19.0 to 3.20.0 1291/head
dependabot-preview[bot] [Mon, 7 Sep 2020 08:18:43 +0000 (08:18 +0000)] 
Bump tox from 3.19.0 to 3.20.0

Bumps [tox](https://github.com/tox-dev/tox) from 3.19.0 to 3.20.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.19.0...3.20.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years agoAdd GitHub templates from Werkzeug (#1282)
Peter Bittner [Sat, 29 Aug 2020 22:19:09 +0000 (00:19 +0200)] 
Add GitHub templates from Werkzeug (#1282)

4 years agoMerge pull request #1281 from pallets/dependabot/pip/pre-commit-2.7.1
dependabot-preview[bot] [Mon, 24 Aug 2020 08:19:47 +0000 (08:19 +0000)] 
Merge pull request #1281 from pallets/dependabot/pip/pre-commit-2.7.1

4 years agoBump pre-commit from 2.6.0 to 2.7.1 1281/head
dependabot-preview[bot] [Mon, 24 Aug 2020 08:17:46 +0000 (08:17 +0000)] 
Bump pre-commit from 2.6.0 to 2.7.1

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

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years agoMerge pull request #1277 from pallets/dependabot/pip/tox-3.19.0
dependabot-preview[bot] [Fri, 7 Aug 2020 07:56:20 +0000 (07:56 +0000)] 
Merge pull request #1277 from pallets/dependabot/pip/tox-3.19.0

4 years agoBump tox from 3.18.1 to 3.19.0 1277/head
dependabot-preview[bot] [Fri, 7 Aug 2020 07:54:31 +0000 (07:54 +0000)] 
Bump tox from 3.18.1 to 3.19.0

Bumps [tox](https://github.com/tox-dev/tox) from 3.18.1 to 3.19.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.18.1...3.19.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years agoMerge pull request #1274 from pallets/dependabot/pip/pip-tools-5.3.1
dependabot-preview[bot] [Mon, 3 Aug 2020 08:58:05 +0000 (08:58 +0000)] 
Merge pull request #1274 from pallets/dependabot/pip/pip-tools-5.3.1

5 years agoBump pip-tools from 5.3.0 to 5.3.1 1274/head
dependabot-preview[bot] [Mon, 3 Aug 2020 08:56:02 +0000 (08:56 +0000)] 
Bump pip-tools from 5.3.0 to 5.3.1

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

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years agoMerge pull request #1271 from pallets/dependabot/pip/pytest-6.0.1
dependabot-preview[bot] [Fri, 31 Jul 2020 08:34:56 +0000 (08:34 +0000)] 
Merge pull request #1271 from pallets/dependabot/pip/pytest-6.0.1

5 years agoBump pytest from 6.0.0 to 6.0.1 1271/head
dependabot-preview[bot] [Fri, 31 Jul 2020 08:32:16 +0000 (08:32 +0000)] 
Bump pytest from 6.0.0 to 6.0.1

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

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

5 years agoBump tox from 3.18.0 to 3.18.1 1268/head
dependabot-preview[bot] [Wed, 29 Jul 2020 08:30:46 +0000 (08:30 +0000)] 
Bump tox from 3.18.0 to 3.18.1

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

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years agoMerge pull request #1267 from pallets/dependabot/pip/pytest-6.0.0
dependabot-preview[bot] [Wed, 29 Jul 2020 08:26:12 +0000 (08:26 +0000)] 
Merge pull request #1267 from pallets/dependabot/pip/pytest-6.0.0

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 agoSetup mypy 1247/head
Teymour Aldridge [Fri, 26 Jun 2020 14:22:21 +0000 (15:22 +0100)] 
Setup mypy
* Add missing type hints (these are intended as an initial set of type hints, to be added upon and improved later)
* Setup MyPy to run as a Github Action

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