Age | Commit message (Collapse) | Author |
|
54b8e1545d am: 8996ce3b20 am: 1b30e09502
Original change: https://android-review.googlesource.com/c/platform/external/python/markupsafe/+/2221451
Change-Id: Ide031473c564efda18ec54559338d228f2a96238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
54b8e1545d am: 8996ce3b20
Original change: https://android-review.googlesource.com/c/platform/external/python/markupsafe/+/2221451
Change-Id: Iea5552e5d2d0f695de6fe775ce3cb6aa1e045e52
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/markupsafe/+/2221451
Change-Id: I3704692c645e94998b8787ab0ab3a31fae41bc44
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/markupsafe/+/2221451
Change-Id: I923c3dd95a687eeef575b08abba7e931fff2b88f
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/markupsafe/+/2221451
Change-Id: I5215b00ff66c486d684aba62bc7cc79827ef1c9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Bug: 245854393
Test: presubmit
Change-Id: I85f0c088f6f2c6d498fdb6af91a7fbac7f330a1e
|
|
4aa7cd23c6 am: d8a6d0f7e4 am: 06f32b0cb2
Original change: https://android-review.googlesource.com/c/platform/external/python/markupsafe/+/2218824
Change-Id: I6b9364634b6a978cbb04a2ecbccc350575e0cbc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
4aa7cd23c6 am: d8a6d0f7e4
Original change: https://android-review.googlesource.com/c/platform/external/python/markupsafe/+/2218824
Change-Id: I7f8e58cfed1facd59dc834664438da1d8a918a91
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/markupsafe/+/2218824
Change-Id: I6f543feb5ea9f3683b3e5694315dc447be2fb600
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/markupsafe/+/2218824
Change-Id: I42433bea80c6f9a951c44d02c47058d0c878fea0
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/markupsafe/+/2218824
Change-Id: I9871b7169edf39429f5c53d8cfa81f999d85d02d
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 markupsafe was being
added to the zip file under src/markupsafe, "import markupsafe"
works currectly, but won't work after the PYTHONPATH
changes (you'd have to say "import src.markupsafe").
To fix this, move the Android.bp file for py-markupsafe
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: I9e2eae397686052404754d4edf5e60c590c3d10b
|
|
Bug: 189946434
Change-Id: I42e407c7989fa7caebe3e4504f2d3e1afddf30ef
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/markupsafe/+/13741405
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I11573d471e5152532f43fda2b00ebc15327e7e26
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/markupsafe/+/13741405
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibb6eceb7b64ec79928d92d8aeecd4c081aa8553d
|
|
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: I9fa7d92e0a3abbe82b95c785042e5fa8f1b64f79
|
|
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.
For the details of merging conflict: b/167204216
Change-Id: Ice72543e236a23a14c458f0dff211db7f31d12f1
|
|
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: I8a7d93fde1ed9aca20ab6c2d688138eb59989040
|
|
Bug: 165704634
Test: make build pass
Change-Id: I599fae0ac826d0ed457dfc15a205102489c99da5
|
|
Merge branch 'upstream-master' of sso://googleplex-android/platform/external/python/markupsafe
Third-party review: ag/12415762
Bug: 165703675
Change-Id: Id1e1cc64feccc247be68dc1caa7ebebb76a5f607
|
|
|
|
|
|
Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 3.1.2 to 3.2.0.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/3.x/CHANGES)
- [Commits](https://github.com/sphinx-doc/sphinx/compare/v3.1.2...v3.2.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
|
|
|
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>
|
|
|
|
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>
|
|
|
|
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>
|
|
|
|
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>
|
|
|
|
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>
|
|
|
|
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>
|
|
|
|
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>
|
|
|
|
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>
|
|
|
|
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>
|
|
|
|
Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/3.x/CHANGES)
- [Commits](https://github.com/sphinx-doc/sphinx/compare/v3.1.1...v3.1.2)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
|
|
|
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>
|
|
|
|
|
|
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>
|
|
|
|
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>
|