summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Merge pull request #1051 from vstinner/tb_next_py37David Lord2019-09-042-5/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix TracebackFrameProxy.set_next() on Python 3.7
| | * | | | | Fix TracebackFrameProxy.set_next() on Python 3.7Victor Stinner2019-09-042-5/+13
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue #1050: fix a crash in TracebackFrameProxy.set_next() on Python 3.7 and newer, when Python is build in debug mode. Since Python 3.7, traceback.tb_next field can be modified: ctypes is no longer needed.
* | | | | | Merge pull request #1045 from yuriks/patch-1Joshua Bronson2019-08-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update PyPI link to point to Jinja2 instead of 1
| * | | | | | Update PyPI link to point to Jinja2 instead of 1Yuri Kunde Schlesner2019-08-081-1/+1
|/ / / / / /
* | | | | | Merge branch '2.10.x'David Lord2019-07-2636-1638/+618
|\ \ \ \ \ \ | |/ / / / /
| * | | | | fix tox docs buildDavid Lord2019-07-261-0/+1
| | | | | |
| * | | | | Merge branch '2.9.x' into docsDavid Lord2019-07-2632-1592/+577
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #1042 from pallets/docs2.9.xDavid Lord2019-07-2635-1694/+732
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | modernize docs, 2.9.x branch
| | | * | | | | reformat readmeDavid Lord2019-07-261-400/+446
| | | | | | | |
| | | * | | | | fix linkcheck issuesdocsDavid Lord2019-07-267-25/+24
| | | | | | | |
| | | * | | | | modernize docs config, use pallets-sphinx-themesDavid Lord2019-07-2630-1149/+142
| | |/ / / / /
| * | | | | | Merge pull request #981 from pwlandoll/2.10.xDavid Lord2019-07-221-0/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add Links section to README
| | * | | | | | Add Links section to READMEPeter Landoll2019-05-061-0/+11
| | | | | | | |
| * | | | | | | Merge pull request #986 from pbjr23/fix-safe-range-memoryDavid Lord2019-07-223-7/+23
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix memory usage bug in Python 2 by using correct version of range
| | * | | | | | | sandbox uses xrange on Python 2Prakhar Bhandari2019-07-223-7/+23
| |/ / / / / / /
* | | | | | | | Fix typoMin ho Kim2019-07-251-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #1035 from utoddl/stable-sort-docDavid Lord2019-07-231-15/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | document that sort is stable
| * | | | | | | clean up sort filter docsDavid Lord2019-07-231-21/+22
| | | | | | | |
| * | | | | | | document that sort is stableTodd Lewis2019-07-231-2/+13
|/ / / / / / /
* | | | | | | Merge pull request #956 from revelt/patch-1David Lord2019-07-231-26/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Tweak docs grouper chapter
| * | | | | | | clean up groupby filter docsDavid Lord2019-07-231-26/+23
| | | | | | | |
| * | | | | | | clarify groupby behavior in docsRoy Revelt2019-07-231-4/+4
|/ / / / / / /
* | | | | | | Merge pull request #923 from CleoQc/feature/long_integer_with_underscoresDavid Lord2019-07-235-41/+82
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Feature/long integer with underscores
| * | | | | | | clean up numeric underscore supportDavid Lord2019-07-234-42/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add changelog clean up docs parametrize tests explain float regex
| * | | | | | | support underscore in int and floatCleoQc2019-07-233-11/+24
|/ / / / / / /
* | | | | | | Merge pull request #922 from CleoQc/feature/support_scientific_notationDavid Lord2019-07-235-12/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Feature/support scientific notation
| * | | | | | | clean up scientific notation supportDavid Lord2019-07-234-22/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add changelog clean up docs parametrize tests
| * | | | | | | support scientific notationCleoQc2019-07-223-6/+21
|/ / / / / / /
* | | | | | | Merge pull request #961 from JulienPalard/TemplateNotFoundDavid Lord2019-07-221-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Better repr for TemplateNotFound.
| * | | | | | | Better repr for TemplateNotFound.Julien Palard2019-03-181-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #994 from bkiu/931-undeclared-variablesDavid Lord2019-07-223-1/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | exclude globals from find_undeclared_variables
| * | | | | | | | exclude globals from find_undeclared_variablesBrendan2019-07-223-1/+7
|/ / / / / / / /
* | | | | | | | Merge pull request #985 from bkiu/557-map-defaultDavid Lord2019-07-222-6/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Adding a default parameter to builtin map filter
| * \ \ \ \ \ \ \ Merge branch 'master' into 557-map-defaultDavid Lord2019-07-2231-215/+581
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #990 from tbnorth/vim_syntax_tweakDavid Lord2019-07-221-0/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | This is the correct thing to do, vim-wise, although whether
| * | | | | | | | | This is the correct thing to do, vim-wise, although whetherTerry N. Brown2019-05-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it has any impact depends on how the user has folding set up in vim. I confirmed that with the change, a folding setup that uses these variables works, whereas without the change, the same setup doesn't work. Change only effects a file that has to be manually copied to the user's ~/.vim/syntax folder, so it won't impact jinja execution in any way.
* | | | | | | | | | Merge pull request #1018 from kbiggers/jinja/557David Lord2019-07-223-6/+47
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | add default to map filter
| * | | | | | | | | | add default to map filterKevin2019-07-223-6/+47
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1014 from markroth8/mroth/fix/748David Lord2019-07-203-17/+39
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Allow '{%+' to be valid syntax (but NOP) when lstrip_blocks == False. Fixes #748
| * | | | | | | | | | Allow '{%+' to be valid syntax (but NOP) when lstrip_blocks == False. Fixes ↵Mark Roth2019-07-203-17/+39
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #748.
* | | | | | | | | | Merge pull request #1022 from jdufresne/hlDavid Lord2019-07-201-3/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Correct syntax highlighting of jinja block in docs
| * | | | | | | | | | Correct syntax highlighting of jinja block in docsJon Dufresne2019-07-201-3/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '2.10.x'David Lord2019-07-2011-110/+171
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #1030 from rillian/PytestUnknownMarkWarningDavid Lord2019-07-202-2/+44
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix pytest unknown mark warnings
| | * | | | | | | | | warnings are errors during testsDavid Lord2019-07-201-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Register custom test category markers.Ralph Giles2019-07-201-1/+43
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since around pytest 3.6 it's been possible to register custom markers, and since version 4.5.0 pytest warns about any which are not registered. Register a list of such markers, extracted from those warnings, so they don't clutter the test output.
| * | | | | | | | | ignore coverage parse errorsDavid Lord2019-07-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Azure has Python 2.7.15 and Python 3.5.5, which can't parse async code. Later patch versions can parse it fine, so this can be removed if Azure updates.
| * | | | | | | | | switch tests to azure pipelinesDavid Lord2019-07-206-104/+91
| | | | | | | | | |
| * | | | | | | | | Merge pull request #1019 from ↵David Lord2019-06-187-26/+26
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jbarreneche/backport-python3.7-collections-warning-fix Backport python3.7 collections warning fix
| | * | | | | | | | | Add python 3.7 deprecation warning fix to changelogJuan Barreneche2019-06-181-0/+7
| | | | | | | | | | |