aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-03-26Remove py2-jinja am: 2eeef3086d am: b68f072860 am: df4293efb2 am: ac0a22bba9aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000android13-mainline-tzdata4-releaseaml_tz4_332714010Dan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/python/jinja/+/2045745 Change-Id: Ied89f6b7724f70f985b28911d73f054112dbc1a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-26Remove py2-jinja am: 2eeef3086d am: b68f072860 am: df4293efb2t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseDan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/python/jinja/+/2045745 Change-Id: I397212554b56d7c2b9e0acdf6d98be68caab5d1e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-26Remove py2-jinja am: 2eeef3086d am: b68f072860Dan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/python/jinja/+/2045745 Change-Id: I22127bb428b0c8b577f5dfc4c0319a766bfb0b0f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-26Remove py2-jinja am: 2eeef3086dDan Willemsen
Original change: https://android-review.googlesource.com/c/platform/external/python/jinja/+/2045745 Change-Id: I818a97952f98d7db9889ec3b91946ea958b59c10 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25Remove py2-jinjaDan Willemsen
This depends on setuptools, which has dropped Python2 support. Test: treehugger Change-Id: Ibd01feb1ecf59da378fc4503ba72f542efef51e6
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Ied55fdd82309ce4fef9a28daed547f7605f6b164
2021-03-02[LSC] Add LOCAL_LICENSE_KINDS to external/python/jinja am: a3d456e346android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r97android-mainline-12.0.0_r96android-mainline-12.0.0_r95android-mainline-12.0.0_r94android-mainline-12.0.0_r93android-mainline-12.0.0_r92android-mainline-12.0.0_r91android-mainline-12.0.0_r90android-mainline-12.0.0_r9android-mainline-12.0.0_r89android-mainline-12.0.0_r88android-mainline-12.0.0_r87android-mainline-12.0.0_r86android-mainline-12.0.0_r85android-mainline-12.0.0_r84android-mainline-12.0.0_r83android-mainline-12.0.0_r82android-mainline-12.0.0_r81android-mainline-12.0.0_r80android-mainline-12.0.0_r8android-mainline-12.0.0_r79android-mainline-12.0.0_r78android-mainline-12.0.0_r77android-mainline-12.0.0_r76android-mainline-12.0.0_r75android-mainline-12.0.0_r74android-mainline-12.0.0_r73android-mainline-12.0.0_r72android-mainline-12.0.0_r71android-mainline-12.0.0_r70android-mainline-12.0.0_r7android-mainline-12.0.0_r69android-mainline-12.0.0_r68android-mainline-12.0.0_r67android-mainline-12.0.0_r66android-mainline-12.0.0_r65android-mainline-12.0.0_r64android-mainline-12.0.0_r63android-mainline-12.0.0_r62android-mainline-12.0.0_r61android-mainline-12.0.0_r60android-mainline-12.0.0_r6android-mainline-12.0.0_r59android-mainline-12.0.0_r58android-mainline-12.0.0_r57android-mainline-12.0.0_r56android-mainline-12.0.0_r53android-mainline-12.0.0_r52android-mainline-12.0.0_r51android-mainline-12.0.0_r50android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r48android-mainline-12.0.0_r47android-mainline-12.0.0_r46android-mainline-12.0.0_r45android-mainline-12.0.0_r44android-mainline-12.0.0_r43android-mainline-12.0.0_r42android-mainline-12.0.0_r41android-mainline-12.0.0_r40android-mainline-12.0.0_r39android-mainline-12.0.0_r38android-mainline-12.0.0_r37android-mainline-12.0.0_r35android-mainline-12.0.0_r34android-mainline-12.0.0_r33android-mainline-12.0.0_r32android-mainline-12.0.0_r31android-mainline-12.0.0_r30android-mainline-12.0.0_r3android-mainline-12.0.0_r29android-mainline-12.0.0_r28android-mainline-12.0.0_r27android-mainline-12.0.0_r26android-mainline-12.0.0_r25android-mainline-12.0.0_r24android-mainline-12.0.0_r23android-mainline-12.0.0_r22android-mainline-12.0.0_r21android-mainline-12.0.0_r20android-mainline-12.0.0_r2android-mainline-12.0.0_r19android-mainline-12.0.0_r18android-mainline-12.0.0_r17android-mainline-12.0.0_r16android-mainline-12.0.0_r15android-mainline-12.0.0_r14android-mainline-12.0.0_r13android-mainline-12.0.0_r126android-mainline-12.0.0_r125android-mainline-12.0.0_r124android-mainline-12.0.0_r123android-mainline-12.0.0_r122android-mainline-12.0.0_r121android-mainline-12.0.0_r120android-mainline-12.0.0_r12android-mainline-12.0.0_r119android-mainline-12.0.0_r118android-mainline-12.0.0_r117android-mainline-12.0.0_r116android-mainline-12.0.0_r115android-mainline-12.0.0_r114android-mainline-12.0.0_r113android-mainline-12.0.0_r110android-mainline-12.0.0_r11android-mainline-12.0.0_r109android-mainline-12.0.0_r108android-mainline-12.0.0_r107android-mainline-12.0.0_r106android-mainline-12.0.0_r105android-mainline-12.0.0_r104android-mainline-12.0.0_r103android-mainline-12.0.0_r102android-mainline-12.0.0_r101android-mainline-12.0.0_r100android-mainline-12.0.0_r10android-mainline-12.0.0_r1aml_wif_311811030aml_tz3_311312010aml_tet_311811050aml_sdk_311710000aml_pco_311011000aml_mpr_311911090aml_doc_310851020android12-mainline-wifi-releaseandroid12-mainline-tethering-releaseandroid12-mainline-statsd-releaseandroid12-mainline-sdkext-releaseandroid12-mainline-resolv-releaseandroid12-mainline-permission-releaseandroid12-mainline-neuralnetworks-releaseandroid12-mainline-networkstack-releaseandroid12-mainline-mediaprovider-releaseandroid12-mainline-media-swcodec-releaseandroid12-mainline-media-releaseandroid12-mainline-ipsec-releaseandroid12-mainline-extservices-releaseandroid12-mainline-documentsui-releaseandroid12-mainline-conscrypt-releaseandroid12-mainline-cellbroadcast-releaseandroid12-mainline-captiveportallogin-releaseandroid12-mainline-art-releaseandroid12-mainline-adbd-releaseBob Badour
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/jinja/+/13741077 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iaf261e4d02bd845989c0dc96c0afeecebbd5168f
2021-03-02[LSC] Add LOCAL_LICENSE_KINDS to external/python/jinja am: a3d456e346Bob Badour
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/jinja/+/13741077 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2d6b8e359eedc23664d704a4898fe043a8cd57f7
2021-03-01[LSC] Add LOCAL_LICENSE_KINDS to external/python/jinjaplatform-tools-33.0.1platform-tools-33.0.0platform-tools-32.0.0android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseBob Badour
Added SPDX-license-identifier-BSD to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I4da8a44f26e395f1704152d53dd8e9fa6cfc77cf
2020-09-10Revert^2 "Add build rule for jinja lib."IRIS YANG
The markupsafe lib wasn't in the master-without-vendor branch due to there is merge conflict master -> master-without-vendor that has not been resolved. But markupsafe is merged in master-without-vendor branch now. ag/12545538. So add the build rule back. Change-Id: I68808b64c36f7c66081e998d15aaabbad7218ec9
2020-09-09Revert "Add build rule for jinja lib."Robin Peng
Revert "Add build rule for markupsafe" Revert submission 12537164-jinja-build Reason for revert: Broken build 6821614 on git_master-without-vendor on all build targets Reverted Changes: I599fae0ac:Add build rule for markupsafe I68a223bad:Add build rule for jinja lib. Change-Id: Ie2ce44d68f8931b8cc3e83cc5c52a681baba81d4
2020-09-08Add build rule for jinja lib.Iris Yang
Bug: 165704634 Test: make build pass Change-Id: I68a223badcb4b95839a05afc520eaed53ee08cee
2020-08-18Merge "Revert "Revert "Import external/python/jinja into master"""TreeHugger Robot
2020-08-18Revert "Revert "Import external/python/jinja into master""IRIS YANG
This reverts commit 81aec74062b5c629b3408f7f3d18343ec0bbcab8. Reason for revert: It seems Jinja folder is empty. Revert the revert to add files back. Third-party review: ag/11821018 Change-Id: I4429a3b3448cdf2eb62ec388392a2a29fa3dbc21
2020-07-17Merge "Import external/python/jinja into master"TreeHugger Robot
2020-07-17Import external/python/jinja into masterIris Yang
Merge branch 'upstream-master' of sso://googleplex-android/platform/external/python/jinja into master Third-party review: ag/11821018 Bug:156559156 Change-Id: I233b6667e9093a0785d665945450d1cac38cfafe
2020-07-17Revert "Import external/python/jinja into master"IRIS YANG
This reverts commit e868444bb65b7ae2a025b1c8c7854a8c4f2f58c1. Reason for revert: Since build will failed. We might need to wait b/160731429 fixed and submit it again. Change-Id: I56449de779d11c13cdfe1243b9a9726f94e55b33
2020-07-13Import external/python/jinja into masterIris Yang
Merge branch 'upstream-master' of sso://googleplex-android/platform/external/python/jinja into master Third-party review: ag/11821018 Bug:156559156 Change-Id: I1849cf7b602455dc58a05016d9940c1985007a39
2020-07-01Initial empty repositoryInna Palant
2020-06-22Merge pull request #1240 from MLH-Fellowship/ignore-trim-blocksDavid Lord
Allow +%} to ignore trim_blocks
2020-06-22ignore trim_blocks using '+%}'Amy
2020-06-22Merge pull request #1241 from MLH-Fellowship/macros_with_globalsDavid Lord
Fix bug with imported macros and template globals
2020-06-22imported templates can see the current globalsAmy
_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.
2020-06-19add more tests for import context behaviorAmy
2020-06-15Merge pull request #1238 from MLH-Fellowship/1197-sandboxDavid Lord
Remove sandbox Python < 3.5 compat
2020-06-15remove sandbox._MagicFormatMappingAmy
add test for escape formatter
2020-06-11add contributing guideDavid Lord
2020-06-10Merge pull request #1232 from pallets/dependabot/pip/pre-commit-2.5.1dependabot-preview[bot]
2020-06-10Bump pre-commit from 2.5.0 to 2.5.1dependabot-preview[bot]
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>
2020-06-10Merge pull request #1231 from pallets/dependabot/pip/pip-tools-5.2.1dependabot-preview[bot]
2020-06-10Bump pip-tools from 5.2.0 to 5.2.1dependabot-preview[bot]
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>
2020-06-09Merge pull request #1230 from pallets/dependabot/pip/pre-commit-2.5.0dependabot-preview[bot]
2020-06-09Bump pre-commit from 2.4.0 to 2.5.0dependabot-preview[bot]
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>
2020-06-08Merge pull request #1229 from pallets/dependabot/pip/tox-3.15.2dependabot-preview[bot]
2020-06-08Bump tox from 3.15.1 to 3.15.2dependabot-preview[bot]
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>
2020-06-03Merge pull request #1228 from pallets/dependabot/pip/pytest-5.4.3David Lord
Bump pytest from 5.4.2 to 5.4.3
2020-06-03Bump pytest from 5.4.2 to 5.4.3dependabot-preview[bot]
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>
2020-05-28Bump pip-tools from 5.1.2 to 5.2.0 (#1227)dependabot-preview[bot]
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>
2020-05-23add EditorConfigDavid Lord
2020-05-23Merge pull request #1225 from pallets/github-actionsDavid Lord
use GitHub Actions for CI
2020-05-23use GitHub Actions for CIDavid Lord
2020-05-23Merge pull request #1224 from pallets/loader-docsDavid Lord
update package and filesystem loader docs
2020-05-23update package and filesystem loader docsDavid Lord
2020-05-23Merge pull request #1222 from pallets/dependabot/pip/tox-3.15.1David Lord
Bump tox from 3.15.0 to 3.15.1
2020-05-23Bump tox from 3.15.0 to 3.15.1dependabot-preview[bot]
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>
2020-05-23Merge pull request #1221 from pallets/remove-docs-devDavid Lord
remove docs requirements from dev requirments
2020-05-23remove docs requirements from dev requirmentsDavid Lord
otherwise Sphinx will cause Jinja to be pinned
2020-05-18try another dependabot ignore patternDavid Lord
2020-05-18try another dependabot ignore patternDavid Lord
2020-05-18fix dependabot config syntaxDavid Lord
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 10:03:17 +0000