Jinja2 dependency upgrade: 2.10.3 -> 2.11.2 #11023
Conversation
Signed-off-by: Michael Payne <michael@sooper.org>
adamkotwasinski
force-pushed
the
jinja
branch
3 times, most recently
from
11395c9
to
5e1d1f0
Compare
bazel/external/jinja.BUILD
Outdated
| genrule( | ||
| name = "move_sources_up_one_level", | ||
| srcs = ["//:jinja2_sources"], | ||
| outs = [ |
There was a problem hiding this comment.
I couldn't figure this out, I wish I knew how to do something like
outs = [f.replace('src/jinja2', 'jinja2') for f in //:jinja2_sources]
adamkotwasinski
changed the title
|
/review @htuch @moderation |
bazel/external/jinja.BUILD
Outdated
| py_library( | ||
| name = "jinja2", | ||
| srcs = glob(["jinja2/**/*.py"]), | ||
| srcs = ["//:move_sources_up_one_level"], |
There was a problem hiding this comment.
Could you use https://docs.bazel.build/versions/master/be/python.html#py_binary.imports to enable the glob to still work?
|
Converting back to draft - looks like at least one other lib was doing something similar e.g. https://github.com/envoyproxy/envoy/blob/master/bazel/external/apache_thrift.BUILD#L4 @htuch had an great idea of using |
adamkotwasinski
changed the title
Signed-off-by: Adam Kotwasinski <adam.kotwasinski@gmail.com>
…e python package is still 'jinja2' Signed-off-by: Adam Kotwasinski <adam.kotwasinski@gmail.com>
adamkotwasinski
changed the title
| ) for f in src_files], | ||
| ), | ||
| visibility = ["//visibility:private"], | ||
| ) |
There was a problem hiding this comment.
As discussed on Slack, I reckon https://github.com/bazelbuild/rules_python would be a better option and probably more maintainable. I don't think it would be a ton of work to get happening, but famous last words. If you prefer you can file an issue and put a TODO here.
Out of curiosity, would https://docs.bazel.build/versions/master/be/python.html#py_binary.imports have been any help?
There was a problem hiding this comment.
I couldn't get imports to work, but I've had only limited exposure to bazel.
There was a problem hiding this comment.
Sure; I'm actually doing some of the required plumbing here in #11058, so in the near future we might have pip3 support in the repository.
|
I'll close this issue for now, as I think we got into a bit of XY problem, where python dependencies should be managed in a bit different way, without all the black magic that's touched in this PR. |
Commit Message: Jinja dependency upgrade (2.10.3 -> 2.11.2)
Additional Description:
The archive we are downloading changed its structure (.py files moved from
jinja2tosrc/jinja2).Trivial globbing
src/jinja2/*.pycauses problems, as the result library is provided assrc.jinja2.Even if we accept this (despite looking ugly), then it looks like jinja invokes code reflectively (via python
exec) to generate templates, and that fails because the generated code appears to invoke modulejinja2again.So I did the trivial thing - moved all the .py files from src/jinja2 to jinja2, so the library would look okay. Unfortunately couldn't figure out how to list output files as function of input files, but I'm not a Bazel wizard.
misc commentary: if
http_archive(what makesenvoy_http_archivework) could strip multiple segments withstip_prefixwe could have just strippedjinja2-2.11.2/src, as we do not care about the rest of repository.Risk Level: Low
Testing: Build machine & local; Kafka integration tests pass too
Docs Changes: some txt files got changed too
Release Notes: N/A