> On Nov. 17, 2016, 2:48 p.m., Zameer Manji wrote: > > api/src/main/thrift/org/apache/aurora/gen/BUILD, line 34 > > <https://reviews.apache.org/r/53836/diff/1/?file=1565790#file1565790line34> > > > > Can't we have our own 3rdparty thrift target that includes the thrift > > lib and this prepare binary? Then we can put the dep in one place. > > John Sirois wrote: > I can, but this requires a custom pants plugin (housed as a loose python > sourcefile in the repo) to expose, say, an `aurora_py_thrift_lib` target. > Your comments here expressed reservations about that: > https://reviews.apache.org/r/40219/ > If you re-ack you're in-fact OK with a custom plugin for this, I'll whip > up diff 2. > > Zameer Manji wrote: > I think in this case, a custom pants plugin will be better, assuming the > API in this version is stable until pants 2.x > > John Sirois wrote: > Yes, the API gaurantees are strong with pants since 1.0.0 and the plugin > APIs needed for this will be stable until 2.x. > > John Sirois wrote: > Re-reading what you suggest which of course requires no plugin, simply > adding the dep to target at address `3rdparty/python:thrift` is > straightforward. Will do.
Fixed. - John ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/53836/#review156248 ----------------------------------------------------------- On Dec. 6, 2016, 5:30 p.m., John Sirois wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/53836/ > ----------------------------------------------------------- > > (Updated Dec. 6, 2016, 5:30 p.m.) > > > Review request for Aurora, Joshua Cohen, Stephan Erb, and Zameer Manji. > > > Repository: aurora > > > Description > ------- > > This required an upgrade to the latest pants dev release to correct > an issue with the setup.py binary packager we use to generate sdists. > > This is for sanity sake, and, once the TODO in > `build-support/thrift/prepare_binary.sh` is addressed, it will also > allow pants-patch-free addition of new platforms (thinking ARM). > > api/src/main/thrift/org/apache/aurora/gen/BUILD | 3 > +++ > api/src/main/thrift/org/apache/thermos/BUILD | 1 + > build-support/thrift/.gitignore | 1 + > build-support/thrift/AURORA-1727.compiler.cpp.Makefile.in.patch | 42 > +++++++++++++------------------ > build-support/thrift/AURORA-1727.lib.py.setup.py.patch | 45 > +++++++++++++++++++++++++++++++++ > {api/src/main/thrift/org/apache/thermos => build-support/thrift}/BUILD | 18 > ++++--------- > build-support/thrift/Makefile | 2 > +- > build-support/thrift/prepare_binary.sh | 68 > ++++++++++++++++++++++++++++++++++++++++++++++++++ > build-support/thrift/thriftw | 12 > +++++++-- > pants.ini | 7 > +++++- > 10 files changed, 158 insertions(+), 41 deletions(-) > > > Diffs > ----- > > api/src/main/thrift/org/apache/aurora/gen/BUILD > f4004a3ca36078c6d24991db4beb68903a05652c > api/src/main/thrift/org/apache/thermos/BUILD > cb655a2fd35d22f7d7e80c4311742bad763d8614 > build-support/thrift/.gitignore 9a3adb69210ba3dbf3c1f408895561da37e8f4c3 > build-support/thrift/AURORA-1727.compiler.cpp.Makefile.in.patch > b69e3fef137cd73c6f2b73201463a0705ef8082a > build-support/thrift/AURORA-1727.lib.py.setup.py.patch PRE-CREATION > build-support/thrift/BUILD PRE-CREATION > build-support/thrift/Makefile 48b174ad622288d2738a5fa37bbb72385fcc3a27 > build-support/thrift/prepare_binary.sh PRE-CREATION > build-support/thrift/thriftw 50d6dfdeb16ca8bf14aaff7aa826e3d69c5e13f0 > pants.ini cecdb277f327f77b2652f76a30fc8d4ffd9ff1db > src/main/python/apache/aurora/admin/BUILD > b5d37f718a25d43d7ac07e30f789cf526bdfdcc2 > src/main/python/apache/aurora/client/BUILD > 1411765ed47d4286e3ba0636bc3f3c1b29afac02 > src/main/python/apache/aurora/common/BUILD > 0e4c51020946dc21953493bd43b944177c444c28 > src/main/python/apache/aurora/config/BUILD > 12e7fe973f456d0847ce63d3b293131a7f4c3bdd > src/main/python/apache/aurora/executor/BUILD > 486230db34a22ea5dd0f68da911c0afb1afbcac0 > src/main/python/apache/aurora/kerberos/BUILD > 847852fdf7762789579f8818c677dc1f79a76c73 > src/main/python/apache/aurora/tools/BUILD > 6717f92c65d7bc1d71c67e37f57750c28f10fda3 > src/main/python/apache/thermos/cli/BUILD > a4932b2757a53ab8654c5d9c0fbae4446c9c5383 > src/main/python/apache/thermos/common/BUILD > 0adabbfa3f0230dae95aca5002c128832916fdd6 > src/main/python/apache/thermos/config/BUILD > 6e52c4bbe111529e14327de699218d9340e66fa9 > src/main/python/apache/thermos/core/BUILD > 82448cec3380e237001f2fb02a28df4c5e5adb30 > src/main/python/apache/thermos/monitoring/BUILD > 65ba7088f65e7baa5d30744736ba456b46a55e86 > src/main/python/apache/thermos/observer/BUILD > 95b8dcd7d123d3a2bcb22df7efc60374ef919bf7 > src/main/python/apache/thermos/runner/BUILD > 085b6ce35e8f67d9db0f6838bafeeb525191e6e9 > src/main/python/apache/thermos/testing/BUILD > 24261701c5334999431a6cd41a6a711753180a89 > src/test/python/apache/aurora/BUILD > 626f1108a24e25747f2c57b4a9f21acbc32fd2d5 > src/test/python/apache/aurora/admin/BUILD > 093537ed13406be3e8dff3245283b4d8d53481a3 > src/test/python/apache/aurora/client/BUILD > 0dc7b8ed19e1216d027095afc43e063d17bedad1 > src/test/python/apache/aurora/client/api/BUILD > e9742240ec4847b4256b554a01dd2369f6fb62f5 > src/test/python/apache/aurora/client/cli/BUILD > 16c4eb5bfbb751ba307f6f7b4335c2dbb99acb46 > src/test/python/apache/aurora/client/docker/BUILD > 5ea2cf791cdec6011978770fc0cffe90e4e7735d > src/test/python/apache/aurora/client/hooks/BUILD > 47c86d98ef8e3eaaef3eba1b2e5179848c256fb9 > src/test/python/apache/aurora/common/BUILD > b3991ee6086269811cffbe5a65bf92fc74002379 > src/test/python/apache/aurora/common/health_check/BUILD > e73f0c0579d81ed1da8fa663e6a3af5dbc866c73 > src/test/python/apache/aurora/config/BUILD > ec7909d9442c986225f075ba3ec8e4bfce50dc85 > src/test/python/apache/aurora/executor/BUILD > d5724746dd0f8b4ef95abbe5a1e75e22548c1b55 > src/test/python/apache/aurora/executor/bin/BUILD > c9dcb9f1ed98dc98b52a5a5f0acd66845b0fffb3 > src/test/python/apache/aurora/executor/common/BUILD > 5b794304659d6f80f05a140166c19856c8feef10 > src/test/python/apache/aurora/tools/BUILD > bf3bbf976968967873c7332708e254a7c2e2a14b > src/test/python/apache/thermos/cli/BUILD > 401bdba8c89ca47dfd65dc2142fcdb13d544a413 > src/test/python/apache/thermos/cli/commands/BUILD > 7ed1d6ce067682c298e1a56d28c1b29de1e05086 > src/test/python/apache/thermos/common/BUILD > b570759b5829c144b7c90744dd5f86cd9f490289 > src/test/python/apache/thermos/config/BUILD > a507157a3f8df6a705339a91d6e82411d997bdf6 > src/test/python/apache/thermos/core/BUILD > 957a116ca0ff9e951bbd49b25d0a6a199d994a2b > src/test/python/apache/thermos/monitoring/BUILD > 8f2b39336dce6c7b580e6ba0009f60afdcb89179 > src/test/python/apache/thermos/observer/BUILD > ec391f24344eefa7ad6ce50145458692bb8b1d97 > src/test/python/apache/thermos/observer/http/BUILD > 708f09bef0755baebb64759eb4e920a1e213765b > > Diff: https://reviews.apache.org/r/53836/diff/ > > > Testing > ------- > > Locally green: > ``` > rm -rf ~/.cache/pants .cache/ > git clean -fdx build-support/thrift > ./pants clean-all > ./build-support/jenkins/build.sh > > vagrant ssh --command "rm -rf ~/.cache/pants && cd aurora && rm -rf .cache/ > && ./pants clean-all" > ./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh > > ./build-support/python/make-pycharm-virtualenv > ``` > > > Thanks, > > John Sirois > >
