Age | Commit message (Collapse) | Author |
|
013e2db912 am: 971bfd47b4
Original change: https://android-review.googlesource.com/c/platform/external/python/jinja/+/2215007
Change-Id: Idc580a1737d5641765d84a1fd7d4b6ee126aa36a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
013e2db912
Original change: https://android-review.googlesource.com/c/platform/external/python/jinja/+/2215007
Change-Id: I8207c0adf7e08808ff06d93fee07c44629ef8114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://android-review.googlesource.com/c/platform/external/python/jinja/+/2215007
Change-Id: Id4b948a5696d9449aa65f101724a1f7ad57b3b00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://android-review.googlesource.com/c/platform/external/python/jinja/+/2215007
Change-Id: Ia4d906d2d9956f4d05160fa08eab30725c92dcab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://android-review.googlesource.com/c/platform/external/python/jinja/+/2215007
Change-Id: I95a86dfe7c487fa425688b1c1aa2c8904dace421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
When soong packages python files into a zip file, it
will take their path relative to the Android.bp file
and preserve that relative path in the zip file. Then
the root directory of the zip file is added to the
PYTHONPATH. Currently, all subdirectories of the top
level zip directory are also added to the PYTHONPATH,
but we want to remove this. Since jinja was being
added to the zip file under src/jinja2, "import jinja2"
works currectly, but won't work after the PYTHONPATH
changes (you'd have to say "import src.jinja2").
To fix this, move the Android.bp file for py-jinja
into the src folder, so the relative paths don't contain
src/. Soong python modules do have a pkg_path attribute,
which essentially adds more folders to the relative path,
but we would need an attribute that removes them, which
doesn't exist. This could also be done with a filegroup
with the "path" attribute, but bp2build doesn't support
that, so I opted to go with this option instead.
Bug: 245583294
Test: Presubmits
Change-Id: I38247f1f7e0a21d2f4f91ff3fc3c04e02ad52954
|
|
am: 215c8609ff
Original change: https://android-review.googlesource.com/c/platform/external/python/jinja/+/2045745
Change-Id: Ibd3dae7b07fd376f8fb66e1a6d08d1801250e3cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
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>
|
|
Original change: https://android-review.googlesource.com/c/platform/external/python/jinja/+/2045745
Change-Id: I542e70f12274b32a4afa4a8480d09408e10eab14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
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>
|
|
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>
|
|
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>
|
|
This depends on setuptools, which has dropped Python2 support.
Test: treehugger
Change-Id: Ibd01feb1ecf59da378fc4503ba72f542efef51e6
|
|
Bug: 189946434
Change-Id: Ied55fdd82309ce4fef9a28daed547f7605f6b164
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/jinja/+/13741077
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaf261e4d02bd845989c0dc96c0afeecebbd5168f
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/jinja/+/13741077
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2d6b8e359eedc23664d704a4898fe043a8cd57f7
|
|
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
|
|
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
|
|
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
|
|
Bug: 165704634
Test: make build pass
Change-Id: I68a223badcb4b95839a05afc520eaed53ee08cee
|
|
|
|
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
|
|
|
|
Merge branch 'upstream-master' of sso://googleplex-android/platform/external/python/jinja into master
Third-party review: ag/11821018
Bug:156559156
Change-Id: I233b6667e9093a0785d665945450d1cac38cfafe
|
|
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
|
|
Merge branch 'upstream-master' of sso://googleplex-android/platform/external/python/jinja into master
Third-party review: ag/11821018
Bug:156559156
Change-Id: I1849cf7b602455dc58a05016d9940c1985007a39
|
|
|
|
Allow +%} to ignore trim_blocks
|
|
|
|
Fix bug with imported macros and template 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.
|
|
|
|
Remove sandbox Python < 3.5 compat
|
|
add test for escape formatter
|
|
|
|
|
|
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>
|
|
|
|
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>
|
|
|
|
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>
|
|
|
|
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>
|
|
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>
|
|
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>
|
|
|
|
use GitHub Actions for CI
|
|
|
|
update package and filesystem loader docs
|