Example repo #89
Example repo #89
Conversation
Problem ------- In the current state bzl-gen-build is not really usable outside of our own usage since it's relying on custom scripts and macros. This is often necessitated by our tendency to use old version of Python etc. Solution -------- This adds an example repository to reimplement some of the scripts and configurations using open source rules_python etc.
crates/python_extractor/src/main.rs
Outdated
| @@ -123,12 +123,16 @@ async fn main() -> Result<()> { | |||
| } | |||
|
|
|||
| fn expand_path_to_defs_from_offset(from_given_path: &str, path: &str) -> Vec<String> { | |||
| if let Some(rem) = path.strip_prefix(from_given_path) { | |||
| if let Some(rem0) = path.strip_prefix(from_given_path) { | |||
| let rem = match rem0.strip_prefix("site-packages/") { | |||
There was a problem hiding this comment.
This is a minor change on Python extractor, needed because rules_python Bzlmod support uses pip-tools, which I think places the 3rdparty source files inside a site-packages/ directory, per module.
crates/python_extractor/src/main.rs
Outdated
| @@ -123,12 +123,16 @@ async fn main() -> Result<()> { | |||
| } | |||
|
|
|||
| fn expand_path_to_defs_from_offset(from_given_path: &str, path: &str) -> Vec<String> { | |||
| if let Some(rem) = path.strip_prefix(from_given_path) { | |||
| if let Some(rem0) = path.strip_prefix(from_given_path) { | |||
| let rem = match rem0.strip_prefix("site-packages/") { | |||
There was a problem hiding this comment.
if let Some(rem) = path.strip_prefix(from_given_path).and_then(|p| p.strip_prefix("site-packages/").unwrap_or(p) {
inner block is ok, too but i'd use unwrap_or here. Probably also just put your comment here into the file
There was a problem hiding this comment.
Addressed in 456bc96
| @@ -0,0 +1,2 @@ | |||
| filegroup(name='hello_files', srcs=glob(include=['**/*.py']), visibility=['//visibility:public']) | |||
| py_library(name='hello', srcs=[':hello_files'], deps=['@@rules_python~0.24.0~pip~pip_39_pandas//:pkg'], visibility=['//visibility:public']) | |||
There was a problem hiding this comment.
that double @ looks fishy to me... is that actually correct?
There was a problem hiding this comment.
Yea Bazel 6's module system seems to use @@:
$ bazel query @@rules_python~0.24.0~pip~pip_39_pytz//:pkg
@@rules_python~0.24.0~pip~pip_39_pytz//:pkg
| @@ -0,0 +1,8 @@ | |||
| java_test( | |||
| name = "Test1", | |||
There was a problem hiding this comment.
this is manually written right?
There was a problem hiding this comment.
Yea, I haven't hooked up Java support in this PR.
| set -o pipefail # don't hide errors within pipes | ||
|
|
||
| cd example | ||
| # TOOLING_WORKING_DIRECTORY=/tmp/bzl-gen-build source build_tools/lang_support/create_lang_build_files/regenerate_protos_build_files.sh |
There was a problem hiding this comment.
why not the protos and the java here btw?
There was a problem hiding this comment.
This example/ used to be part of the Protobuf PR, but it got too big, so I am splitting it up. I figured Python would be most self-contained (without jar scanner etc) to demonstrate, but eventually we should try to hook it up as well using the new jar scanner.
|
|
||
| cd example | ||
| # TOOLING_WORKING_DIRECTORY=/tmp/bzl-gen-build source build_tools/lang_support/create_lang_build_files/regenerate_protos_build_files.sh | ||
| TOOLING_WORKING_DIRECTORY=/tmp/bzl-gen-build source build_tools/lang_support/create_lang_build_files/regenerate_python_build_files.sh |
There was a problem hiding this comment.
should we add a test that the git diff in examples is a clean diff? Seems like it would be a good idea to me.
There was a problem hiding this comment.
Addressed in cdec70c
This is an offshoot from #13
Problem
In the current state bzl-gen-build is not really usable outside of our own usage since it's relying on custom scripts and macros. This is often necessitated by our tendency to use old version of Python etc.
Solution
This adds an example repository to reimplement some of the scripts and configurations using open source rules_python etc.