You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by js...@apache.org on 2016/12/08 02:11:28 UTC
aurora git commit: Get pants using the same thrift binary as gradle.
Repository: aurora
Updated Branches:
refs/heads/master 91ddb075c -> 0c1770581
Get pants using the same thrift binary as gradle.
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).
Reviewed at https://reviews.apache.org/r/53836/
Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/0c177058
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/0c177058
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/0c177058
Branch: refs/heads/master
Commit: 0c1770581317d693f3b388c067d2ddd1dcc2b867
Parents: 91ddb07
Author: John Sirois <js...@apache.org>
Authored: Wed Dec 7 19:11:21 2016 -0700
Committer: John Sirois <jo...@gmail.com>
Committed: Wed Dec 7 19:11:21 2016 -0700
----------------------------------------------------------------------
api/src/main/thrift/org/apache/aurora/gen/BUILD | 7 +-
api/src/main/thrift/org/apache/thermos/BUILD | 3 +-
build-support/thrift/.gitignore | 1 +
.../AURORA-1727.compiler.cpp.Makefile.in.patch | 42 ++++++------
.../thrift/AURORA-1727.lib.py.setup.py.patch | 45 +++++++++++++
build-support/thrift/BUILD | 27 ++++++++
build-support/thrift/Makefile | 2 +-
build-support/thrift/prepare_binary.sh | 68 ++++++++++++++++++++
build-support/thrift/thriftw | 12 +++-
pants.ini | 7 +-
src/main/python/apache/aurora/admin/BUILD | 1 -
src/main/python/apache/aurora/client/BUILD | 1 -
src/main/python/apache/aurora/common/BUILD | 1 -
src/main/python/apache/aurora/config/BUILD | 1 -
src/main/python/apache/aurora/executor/BUILD | 1 -
src/main/python/apache/aurora/kerberos/BUILD | 1 -
src/main/python/apache/aurora/tools/BUILD | 1 -
src/main/python/apache/thermos/cli/BUILD | 1 -
src/main/python/apache/thermos/common/BUILD | 1 -
src/main/python/apache/thermos/config/BUILD | 1 -
src/main/python/apache/thermos/core/BUILD | 1 -
src/main/python/apache/thermos/monitoring/BUILD | 1 -
src/main/python/apache/thermos/observer/BUILD | 1 -
src/main/python/apache/thermos/runner/BUILD | 1 -
src/main/python/apache/thermos/testing/BUILD | 1 -
src/test/python/apache/aurora/BUILD | 1 -
src/test/python/apache/aurora/admin/BUILD | 2 -
src/test/python/apache/aurora/client/BUILD | 2 -
src/test/python/apache/aurora/client/api/BUILD | 2 -
src/test/python/apache/aurora/client/cli/BUILD | 2 -
.../python/apache/aurora/client/docker/BUILD | 2 -
.../python/apache/aurora/client/hooks/BUILD | 3 +-
src/test/python/apache/aurora/common/BUILD | 2 -
.../apache/aurora/common/health_check/BUILD | 2 -
src/test/python/apache/aurora/config/BUILD | 2 -
src/test/python/apache/aurora/executor/BUILD | 2 -
.../python/apache/aurora/executor/bin/BUILD | 2 -
.../python/apache/aurora/executor/common/BUILD | 2 -
src/test/python/apache/aurora/tools/BUILD | 2 -
src/test/python/apache/thermos/cli/BUILD | 2 -
.../python/apache/thermos/cli/commands/BUILD | 2 -
src/test/python/apache/thermos/common/BUILD | 2 -
src/test/python/apache/thermos/config/BUILD | 2 -
src/test/python/apache/thermos/core/BUILD | 2 -
src/test/python/apache/thermos/monitoring/BUILD | 2 -
src/test/python/apache/thermos/observer/BUILD | 2 -
.../python/apache/thermos/observer/http/BUILD | 2 -
47 files changed, 181 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/api/src/main/thrift/org/apache/aurora/gen/BUILD
----------------------------------------------------------------------
diff --git a/api/src/main/thrift/org/apache/aurora/gen/BUILD b/api/src/main/thrift/org/apache/aurora/gen/BUILD
index f4004a3..835b0cc 100644
--- a/api/src/main/thrift/org/apache/aurora/gen/BUILD
+++ b/api/src/main/thrift/org/apache/aurora/gen/BUILD
@@ -22,7 +22,7 @@ python_thrift_library(
'api.thrift',
],
dependencies = [
- '3rdparty/python:thrift',
+ 'build-support/thrift',
],
)
@@ -30,7 +30,7 @@ python_thrift_library(
name = '_test',
sources = TEST_DATA,
dependencies = [
- '3rdparty/python:thrift',
+ 'build-support/thrift',
],
)
@@ -38,13 +38,12 @@ python_thrift_library(
name = '_storage',
sources = ['storage.thrift'],
dependencies = [
- '3rdparty/python:thrift',
+ 'build-support/thrift',
':_api',
],
)
python_library(
- name = 'gen',
dependencies = [
':_api',
':_test',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/api/src/main/thrift/org/apache/thermos/BUILD
----------------------------------------------------------------------
diff --git a/api/src/main/thrift/org/apache/thermos/BUILD b/api/src/main/thrift/org/apache/thermos/BUILD
index cb655a2..b58338e 100644
--- a/api/src/main/thrift/org/apache/thermos/BUILD
+++ b/api/src/main/thrift/org/apache/thermos/BUILD
@@ -15,7 +15,6 @@
import os
python_thrift_library(
- name = 'thermos',
sources = ['thermos_internal.thrift'],
provides = setup_py(
name = 'apache.thermos.thrift',
@@ -23,6 +22,6 @@ python_thrift_library(
description = 'Autogenerated Thermos thrift schemas.',
),
dependencies = [
- '3rdparty/python:thrift',
+ 'build-support/thrift',
],
)
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/build-support/thrift/.gitignore
----------------------------------------------------------------------
diff --git a/build-support/thrift/.gitignore b/build-support/thrift/.gitignore
index 9a3adb6..82c5bc5 100644
--- a/build-support/thrift/.gitignore
+++ b/build-support/thrift/.gitignore
@@ -1 +1,2 @@
+/serve/
/thrift-*
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/build-support/thrift/AURORA-1727.compiler.cpp.Makefile.in.patch
----------------------------------------------------------------------
diff --git a/build-support/thrift/AURORA-1727.compiler.cpp.Makefile.in.patch b/build-support/thrift/AURORA-1727.compiler.cpp.Makefile.in.patch
index b69e3fe..77c966c 100644
--- a/build-support/thrift/AURORA-1727.compiler.cpp.Makefile.in.patch
+++ b/build-support/thrift/AURORA-1727.compiler.cpp.Makefile.in.patch
@@ -1,6 +1,6 @@
---- thrift-0.9.1/compiler/cpp/Makefile.in 2013-08-18 10:01:01.000000000 -0600
-+++ thrift-0.9.1/compiler/cpp/Makefile.in.fix 2016-07-01 13:08:46.928563056 -0600
-@@ -96,27 +96,9 @@
+--- thrift-0.9.1/compiler/cpp/Makefile.in 2016-10-12 11:08:49.012927396 -0600
++++ thrift-0.9.1/compiler/cpp/Makefile.in.fix 2016-10-12 11:11:25.600812386 -0600
+@@ -96,27 +96,10 @@
PROGRAMS = $(bin_PROGRAMS)
am_thrift_OBJECTS = thrift-main.$(OBJEXT) thrift-md5.$(OBJEXT) \
thrift-t_generator.$(OBJEXT) thrift-parse.$(OBJEXT) \
@@ -9,7 +9,7 @@
thrift-t_java_generator.$(OBJEXT) \
- thrift-t_as3_generator.$(OBJEXT) \
- thrift-t_csharp_generator.$(OBJEXT) \
-- thrift-t_py_generator.$(OBJEXT) \
+ thrift-t_py_generator.$(OBJEXT) \
- thrift-t_rb_generator.$(OBJEXT) \
- thrift-t_perl_generator.$(OBJEXT) \
- thrift-t_php_generator.$(OBJEXT) \
@@ -29,7 +29,7 @@
thrift_OBJECTS = $(am_thrift_OBJECTS)
thrift_DEPENDENCIES = libparse.a
thrift_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -377,25 +359,10 @@
+@@ -377,25 +360,11 @@
src/parse/t_const_value.h src/parse/parse.cc \
src/generate/t_generator.h src/generate/t_oop_generator.h \
src/generate/t_html_generator.h src/windows/config.h \
@@ -47,6 +47,7 @@
- src/generate/t_st_generator.cc \
- src/generate/t_ocaml_generator.cc \
- src/generate/t_hs_generator.cc src/generate/t_xsd_generator.cc \
++ src/generate/t_py_generator.cc \
src/generate/t_html_generator.cc \
- src/generate/t_js_generator.cc \
- src/generate/t_javame_generator.cc \
@@ -57,7 +58,7 @@
thrift_CPPFLAGS = -I$(srcdir)/src
thrift_CXXFLAGS = -Wall
thrift_LDADD = @LEXLIB@ libparse.a
-@@ -518,29 +485,10 @@
+@@ -518,29 +487,11 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-md5.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-parse.Po@am__quote@
@@ -80,14 +81,14 @@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_ocaml_generator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_perl_generator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_php_generator.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_py_generator.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_py_generator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_rb_generator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_st_generator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thrift-t_xsd_generator.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -668,34 +616,6 @@
+@@ -668,34 +619,6 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-parse.obj `if test -f 'src/parse/parse.cc'; then $(CYGPATH_W) 'src/parse/parse.cc'; else $(CYGPATH_W) '$(srcdir)/src/parse/parse.cc'; fi`
@@ -122,7 +123,7 @@
thrift-t_java_generator.o: src/generate/t_java_generator.cc
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_java_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_java_generator.Tpo -c -o thrift-t_java_generator.o `test -f 'src/generate/t_java_generator.cc' || echo '$(srcdir)/'`src/generate/t_java_generator.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_java_generator.Tpo $(DEPDIR)/thrift-t_java_generator.Po
-@@ -710,174 +630,6 @@
+@@ -710,34 +633,6 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_java_generator.obj `if test -f 'src/generate/t_java_generator.cc'; then $(CYGPATH_W) 'src/generate/t_java_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_java_generator.cc'; fi`
@@ -154,20 +155,13 @@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_csharp_generator.obj `if test -f 'src/generate/t_csharp_generator.cc'; then $(CYGPATH_W) 'src/generate/t_csharp_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_csharp_generator.cc'; fi`
-
--thrift-t_py_generator.o: src/generate/t_py_generator.cc
--@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_py_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_py_generator.Tpo -c -o thrift-t_py_generator.o `test -f 'src/generate/t_py_generator.cc' || echo '$(srcdir)/'`src/generate/t_py_generator.cc
--@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_py_generator.Tpo $(DEPDIR)/thrift-t_py_generator.Po
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_py_generator.cc' object='thrift-t_py_generator.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_py_generator.o `test -f 'src/generate/t_py_generator.cc' || echo '$(srcdir)/'`src/generate/t_py_generator.cc
--
--thrift-t_py_generator.obj: src/generate/t_py_generator.cc
--@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_py_generator.obj -MD -MP -MF $(DEPDIR)/thrift-t_py_generator.Tpo -c -o thrift-t_py_generator.obj `if test -f 'src/generate/t_py_generator.cc'; then $(CYGPATH_W) 'src/generate/t_py_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_py_generator.cc'; fi`
--@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_py_generator.Tpo $(DEPDIR)/thrift-t_py_generator.Po
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/generate/t_py_generator.cc' object='thrift-t_py_generator.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_py_generator.obj `if test -f 'src/generate/t_py_generator.cc'; then $(CYGPATH_W) 'src/generate/t_py_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_py_generator.cc'; fi`
--
+ thrift-t_py_generator.o: src/generate/t_py_generator.cc
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_py_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_py_generator.Tpo -c -o thrift-t_py_generator.o `test -f 'src/generate/t_py_generator.cc' || echo '$(srcdir)/'`src/generate/t_py_generator.cc
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_py_generator.Tpo $(DEPDIR)/thrift-t_py_generator.Po
+@@ -752,132 +647,6 @@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_py_generator.obj `if test -f 'src/generate/t_py_generator.cc'; then $(CYGPATH_W) 'src/generate/t_py_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_py_generator.cc'; fi`
+
-thrift-t_rb_generator.o: src/generate/t_rb_generator.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_rb_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_rb_generator.Tpo -c -o thrift-t_rb_generator.o `test -f 'src/generate/t_rb_generator.cc' || echo '$(srcdir)/'`src/generate/t_rb_generator.cc
-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_rb_generator.Tpo $(DEPDIR)/thrift-t_rb_generator.Po
@@ -297,7 +291,7 @@
thrift-t_html_generator.o: src/generate/t_html_generator.cc
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -MT thrift-t_html_generator.o -MD -MP -MF $(DEPDIR)/thrift-t_html_generator.Tpo -c -o thrift-t_html_generator.o `test -f 'src/generate/t_html_generator.cc' || echo '$(srcdir)/'`src/generate/t_html_generator.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/thrift-t_html_generator.Tpo $(DEPDIR)/thrift-t_html_generator.Po
-@@ -906,76 +658,6 @@
+@@ -906,76 +675,6 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(thrift_CPPFLAGS) $(CPPFLAGS) $(thrift_CXXFLAGS) $(CXXFLAGS) -c -o thrift-t_js_generator.obj `if test -f 'src/generate/t_js_generator.cc'; then $(CYGPATH_W) 'src/generate/t_js_generator.cc'; else $(CYGPATH_W) '$(srcdir)/src/generate/t_js_generator.cc'; fi`
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/build-support/thrift/AURORA-1727.lib.py.setup.py.patch
----------------------------------------------------------------------
diff --git a/build-support/thrift/AURORA-1727.lib.py.setup.py.patch b/build-support/thrift/AURORA-1727.lib.py.setup.py.patch
new file mode 100644
index 0000000..11c7b13
--- /dev/null
+++ b/build-support/thrift/AURORA-1727.lib.py.setup.py.patch
@@ -0,0 +1,45 @@
+--- thrift-0.9.1/lib/py/setup.py 2013-08-18 09:40:36.000000000 -0600
++++ thrift-0.9.1/lib/py/setup.py.fix 2016-10-12 16:53:48.917117240 -0600
+@@ -19,6 +19,8 @@
+ # under the License.
+ #
+
++from __future__ import print_function
++
+ import sys
+ try:
+ from setuptools import setup, Extension
+@@ -42,13 +44,13 @@
+ def run(self):
+ try:
+ build_ext.run(self)
+- except DistutilsPlatformError, x:
++ except DistutilsPlatformError:
+ raise BuildFailed()
+
+ def build_extension(self, ext):
+ try:
+ build_ext.build_extension(self, ext)
+- except ext_errors, x:
++ except ext_errors:
+ raise BuildFailed()
+
+ def run_setup(with_binary):
+@@ -94,11 +96,11 @@
+ try:
+ run_setup(True)
+ except BuildFailed:
+- print
+- print '*' * 80
+- print "An error occured while trying to compile with the C extension enabled"
+- print "Attempting to build without the extension now"
+- print '*' * 80
+- print
++ print()
++ print('*' * 80)
++ print("An error occured while trying to compile with the C extension enabled")
++ print("Attempting to build without the extension now")
++ print('*' * 80)
++ print()
+
+ run_setup(False)
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/build-support/thrift/BUILD
----------------------------------------------------------------------
diff --git a/build-support/thrift/BUILD b/build-support/thrift/BUILD
new file mode 100644
index 0000000..ab19f1f
--- /dev/null
+++ b/build-support/thrift/BUILD
@@ -0,0 +1,27 @@
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+target(
+ dependencies=[
+ '3rdparty/python:thrift',
+ ':prepare_binary',
+ ]
+)
+
+prep_command(
+ name='prepare_binary',
+ goals=['compile', 'binary', 'test'],
+ prep_environ=False,
+ prep_executable='build-support/thrift/prepare_binary.sh',
+)
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/build-support/thrift/Makefile
----------------------------------------------------------------------
diff --git a/build-support/thrift/Makefile b/build-support/thrift/Makefile
index 48b174a..02e9835 100644
--- a/build-support/thrift/Makefile
+++ b/build-support/thrift/Makefile
@@ -35,7 +35,6 @@ THRIFT_CONFIGURE_FLAGS = \
--without-php \
--without-php_extension \
--without-pic \
- --without-python \
--without-qt4 \
--without-ruby \
--without-tests
@@ -56,6 +55,7 @@ $(THRIFT):
patch -p1 < thrift.patch && \
patch -p1 < ../AURORA-1727.compiler.cpp.Makefile.in.patch && \
patch -p1 < ../AURORA-1727.compiler.cpp.src.generate.t_java_generator.cc.patch && \
+ patch -p1 < ../AURORA-1727.lib.py.setup.py.patch && \
./configure $(THRIFT_CONFIGURE_FLAGS) && \
make -j4
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/build-support/thrift/prepare_binary.sh
----------------------------------------------------------------------
diff --git a/build-support/thrift/prepare_binary.sh b/build-support/thrift/prepare_binary.sh
new file mode 100755
index 0000000..a96b33e
--- /dev/null
+++ b/build-support/thrift/prepare_binary.sh
@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+
+readonly HERE=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)
+
+readonly SERVE_ROOT=${HERE}/serve
+
+# TODO(John Sirois): Eliminate this list (which needs to be expanded each time OSX has a new
+# release) when pants supports querying the current os id or else a psuedo-id like `local`.
+readonly KNOWN_OS_IDS=(
+ linux/i386
+ linux/x86_64
+ mac/10.6
+ mac/10.7
+ mac/10.8
+ mac/10.9
+ mac/10.10
+ mac/10.11
+ mac/10.12
+)
+
+# Runs pants safely as an indirect pants subprocess.
+function run_pants() {
+ ${HERE}/../../pants --no-colors --no-lock "$@"
+}
+
+# Returns the pants option value for the given scope and name.
+function get_pants_option() {
+ readonly scope=$1
+ readonly name=$2
+
+ run_pants options --scope=${scope} --name=${name} --output-format=json 2>/dev/null | \
+ python -c "import json, sys; print(json.load(sys.stdin)['${scope}.${name}']['value'])"
+}
+
+# Ensures the thrift binary of the given version is built for the current machine and returns its
+# path.
+function bootstrap_thrift() {
+ readonly version=$1
+
+ # This bootstraps the thrift compiler via `make` if needed.
+ ${HERE}/thriftw ${version} --version >&2 || true
+
+ # This reports the path of the actual thrift binary used.
+ ${HERE}/thriftw ${version} --which
+}
+
+# Sets up the thrift binary serving directory structure under SERVE_ROOT.
+function prepare_serve() {
+ rm -rf ${SERVE_ROOT}
+
+ readonly thrift_version=$(get_pants_option thrift-binary version)
+ readonly thrift_binary=$(bootstrap_thrift ${thrift_version})
+
+ readonly thrift_bin_dir=$(get_pants_option thrift-binary supportdir)
+ for os_id in "${KNOWN_OS_IDS[@]}"
+ do
+ serve_dir=${SERVE_ROOT}/${thrift_bin_dir}/${os_id}/${thrift_version}
+
+ mkdir -p ${serve_dir}
+ ln -f -s ${thrift_binary} ${serve_dir}/thrift
+ done
+}
+
+prepare_serve
+
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/build-support/thrift/thriftw
----------------------------------------------------------------------
diff --git a/build-support/thrift/thriftw b/build-support/thrift/thriftw
index 50d6dfd..1185298 100755
--- a/build-support/thrift/thriftw
+++ b/build-support/thrift/thriftw
@@ -29,7 +29,11 @@ HERE=$(cd `dirname "${BASH_SOURCE[0]}"` && pwd)
if which thrift >/dev/null 2>&1; then
if [[ $(thrift --version) = "Thrift version $expected_version" ]]; then
- exec thrift "$@"
+ if [[ "$@" == "--which" ]]; then
+ exec which thrift
+ else
+ exec thrift "$@"
+ fi
fi
fi
@@ -37,4 +41,8 @@ thrift="$HERE"/thrift-$expected_version/compiler/cpp/thrift
if [[ ! -x "$thrift" ]]; then
make -C "$HERE"
fi
-exec "$thrift" "$@"
+if [[ "$@" == "--which" ]]; then
+ echo "$thrift"
+else
+ exec "$thrift" "$@"
+fi
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/pants.ini
----------------------------------------------------------------------
diff --git a/pants.ini b/pants.ini
index cecdb27..f25e1d1 100644
--- a/pants.ini
+++ b/pants.ini
@@ -12,7 +12,7 @@
# limitations under the License.
[GLOBAL]
-pants_version: 1.3.0dev0
+pants_version: 1.3.0.dev3
plugins: [
'pantsbuild.pants.contrib.python.checks==%(pants_version)s',
@@ -26,6 +26,11 @@ backend_packages: [
'pants.backend.python',
]
+[binaries]
+# Force pants to grab the thrift binary from the local one we build for gradle to use.
+baseurls: ['%(buildroot)s/build-support/thrift/serve']
+
+
[thrift-binary]
# Pants 0.0.57 defaults to 0.9.2, we want to stay pinned down to 0.9.1 for now.
version: 0.9.1
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/main/python/apache/aurora/admin/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/admin/BUILD b/src/main/python/apache/aurora/admin/BUILD
index b5d37f7..60bfbed 100644
--- a/src/main/python/apache/aurora/admin/BUILD
+++ b/src/main/python/apache/aurora/admin/BUILD
@@ -36,7 +36,6 @@ python_binary(
)
python_library(
- name = 'admin',
dependencies = [
':_admin',
],
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/main/python/apache/aurora/client/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/BUILD b/src/main/python/apache/aurora/client/BUILD
index 1411765..452efd4 100644
--- a/src/main/python/apache/aurora/client/BUILD
+++ b/src/main/python/apache/aurora/client/BUILD
@@ -45,7 +45,6 @@ python_binary(
)
python_library(
- name = 'client',
dependencies = [
':_client',
],
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/main/python/apache/aurora/common/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/common/BUILD b/src/main/python/apache/aurora/common/BUILD
index 0e4c510..85b5b45 100644
--- a/src/main/python/apache/aurora/common/BUILD
+++ b/src/main/python/apache/aurora/common/BUILD
@@ -15,7 +15,6 @@ import os
python_library(
- name = 'common',
sources = rglobs('*.py'),
dependencies = [
'3rdparty/python:pex',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/main/python/apache/aurora/config/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/config/BUILD b/src/main/python/apache/aurora/config/BUILD
index 12e7fe9..14364ef 100644
--- a/src/main/python/apache/aurora/config/BUILD
+++ b/src/main/python/apache/aurora/config/BUILD
@@ -15,7 +15,6 @@ import os
python_library(
- name = 'config',
sources = rglobs('*.py'),
dependencies = [
'3rdparty/python:enum34',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/main/python/apache/aurora/executor/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/BUILD b/src/main/python/apache/aurora/executor/BUILD
index 486230d..bb6d4a3 100644
--- a/src/main/python/apache/aurora/executor/BUILD
+++ b/src/main/python/apache/aurora/executor/BUILD
@@ -59,7 +59,6 @@ python_binary(
)
python_library(
- name = 'executor',
dependencies = [
':_executor',
],
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/main/python/apache/aurora/kerberos/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/kerberos/BUILD b/src/main/python/apache/aurora/kerberos/BUILD
index 847852f..d1e6ded 100644
--- a/src/main/python/apache/aurora/kerberos/BUILD
+++ b/src/main/python/apache/aurora/kerberos/BUILD
@@ -49,7 +49,6 @@ python_binary(
)
python_library(
- name = 'kerberos',
dependencies = [
':_kerberos',
],
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/main/python/apache/aurora/tools/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/tools/BUILD b/src/main/python/apache/aurora/tools/BUILD
index 6717f92..c970bec 100644
--- a/src/main/python/apache/aurora/tools/BUILD
+++ b/src/main/python/apache/aurora/tools/BUILD
@@ -68,7 +68,6 @@ python_binary(
)
python_library(
- name = 'tools',
dependencies = [
':_thermos',
':_thermos_observer',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/main/python/apache/thermos/cli/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/cli/BUILD b/src/main/python/apache/thermos/cli/BUILD
index a4932b2..784b05c 100644
--- a/src/main/python/apache/thermos/cli/BUILD
+++ b/src/main/python/apache/thermos/cli/BUILD
@@ -15,7 +15,6 @@ import os
python_library(
- name = 'cli',
sources = rglobs('*.py'),
dependencies = [
'3rdparty/python:pystachio',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/main/python/apache/thermos/common/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/common/BUILD b/src/main/python/apache/thermos/common/BUILD
index 0adabbf..023b87f 100644
--- a/src/main/python/apache/thermos/common/BUILD
+++ b/src/main/python/apache/thermos/common/BUILD
@@ -16,7 +16,6 @@ import os
python_library(
- name = 'common',
sources = rglobs('*.py'),
dependencies = [
'3rdparty/python:pystachio',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/main/python/apache/thermos/config/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/config/BUILD b/src/main/python/apache/thermos/config/BUILD
index 6e52c4b..729c653 100644
--- a/src/main/python/apache/thermos/config/BUILD
+++ b/src/main/python/apache/thermos/config/BUILD
@@ -16,7 +16,6 @@ import os
python_library(
- name = 'config',
sources = rglobs('*.py'),
dependencies = [
'3rdparty/python:pystachio',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/main/python/apache/thermos/core/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/core/BUILD b/src/main/python/apache/thermos/core/BUILD
index 82448ce..e800cca 100644
--- a/src/main/python/apache/thermos/core/BUILD
+++ b/src/main/python/apache/thermos/core/BUILD
@@ -16,7 +16,6 @@ import os
python_library(
- name = 'core',
sources = rglobs('*.py'),
dependencies = [
'3rdparty/python:psutil',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/main/python/apache/thermos/monitoring/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/monitoring/BUILD b/src/main/python/apache/thermos/monitoring/BUILD
index 65ba708..a1c16ac 100644
--- a/src/main/python/apache/thermos/monitoring/BUILD
+++ b/src/main/python/apache/thermos/monitoring/BUILD
@@ -16,7 +16,6 @@ import os
python_library(
- name = 'monitoring',
sources = rglobs('*.py'),
dependencies = [
'3rdparty/python:psutil',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/main/python/apache/thermos/observer/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/observer/BUILD b/src/main/python/apache/thermos/observer/BUILD
index 95b8dcd..714955d 100644
--- a/src/main/python/apache/thermos/observer/BUILD
+++ b/src/main/python/apache/thermos/observer/BUILD
@@ -16,7 +16,6 @@ import os
python_library(
- name = 'observer',
sources = rglobs('*.py'),
resources = zglobs('**/assets/*', '**/*.tpl'),
dependencies = [
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/main/python/apache/thermos/runner/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/runner/BUILD b/src/main/python/apache/thermos/runner/BUILD
index 085b6ce..d515878 100644
--- a/src/main/python/apache/thermos/runner/BUILD
+++ b/src/main/python/apache/thermos/runner/BUILD
@@ -27,7 +27,6 @@ python_library(
)
python_library(
- name = 'runner',
dependencies = [
':_runner',
],
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/main/python/apache/thermos/testing/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/testing/BUILD b/src/main/python/apache/thermos/testing/BUILD
index 2426170..0964a7d 100644
--- a/src/main/python/apache/thermos/testing/BUILD
+++ b/src/main/python/apache/thermos/testing/BUILD
@@ -13,7 +13,6 @@
#
python_library(
- name = 'testing',
sources = rglobs('*.py'),
dependencies = [
'3rdparty/python:thrift',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/aurora/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/BUILD b/src/test/python/apache/aurora/BUILD
index 626f110..48ea328 100644
--- a/src/test/python/apache/aurora/BUILD
+++ b/src/test/python/apache/aurora/BUILD
@@ -13,7 +13,6 @@
#
python_library(
- name = 'aurora',
sources = [ 'api_util.py' ],
dependencies = [
'api/src/main/thrift/org/apache/aurora/gen',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/aurora/admin/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/admin/BUILD b/src/test/python/apache/aurora/admin/BUILD
index 093537e..8dd8b6d 100644
--- a/src/test/python/apache/aurora/admin/BUILD
+++ b/src/test/python/apache/aurora/admin/BUILD
@@ -13,8 +13,6 @@
#
python_tests(
- name = 'admin',
- sources = globs('*.py'),
dependencies = [
'3rdparty/python:mock',
'3rdparty/python:twitter.common.contextutil',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/aurora/client/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/BUILD b/src/test/python/apache/aurora/client/BUILD
index 0dc7b8e..2347d22 100644
--- a/src/test/python/apache/aurora/client/BUILD
+++ b/src/test/python/apache/aurora/client/BUILD
@@ -13,8 +13,6 @@
#
python_tests(
- name = 'client',
- sources = globs('*.py'),
dependencies = [
'3rdparty/python:mock',
'3rdparty/python:mox',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/aurora/client/api/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/BUILD b/src/test/python/apache/aurora/client/api/BUILD
index e974224..8394d4e 100644
--- a/src/test/python/apache/aurora/client/api/BUILD
+++ b/src/test/python/apache/aurora/client/api/BUILD
@@ -13,8 +13,6 @@
#
python_tests(
- name = 'api',
- sources = globs('*.py'),
dependencies = [
'3rdparty/python:mock',
'3rdparty/python:mox',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/aurora/client/cli/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/BUILD b/src/test/python/apache/aurora/client/cli/BUILD
index 16c4eb5..bd74d64 100644
--- a/src/test/python/apache/aurora/client/cli/BUILD
+++ b/src/test/python/apache/aurora/client/cli/BUILD
@@ -13,8 +13,6 @@
#
python_tests(
- name = 'cli',
- sources = globs('*.py'),
dependencies = [
'3rdparty/python:mock',
'3rdparty/python:twitter.common.contextutil',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/aurora/client/docker/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/docker/BUILD b/src/test/python/apache/aurora/client/docker/BUILD
index 5ea2cf7..f0cf971 100644
--- a/src/test/python/apache/aurora/client/docker/BUILD
+++ b/src/test/python/apache/aurora/client/docker/BUILD
@@ -13,8 +13,6 @@
#
python_tests(
- name = 'docker',
- sources = globs('*py'),
dependencies = [
'3rdparty/python:requests',
'3rdparty/python:requests-mock',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/aurora/client/hooks/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/hooks/BUILD b/src/test/python/apache/aurora/client/hooks/BUILD
index 47c86d9..bbbeb2f 100644
--- a/src/test/python/apache/aurora/client/hooks/BUILD
+++ b/src/test/python/apache/aurora/client/hooks/BUILD
@@ -12,8 +12,7 @@
# limitations under the License.
#
-python_tests(name = 'hooks',
- sources = globs('*.py'),
+python_tests(
dependencies = [
'3rdparty/python:mock',
'src/main/python/apache/aurora/common',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/aurora/common/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/common/BUILD b/src/test/python/apache/aurora/common/BUILD
index b3991ee..a65a959 100644
--- a/src/test/python/apache/aurora/common/BUILD
+++ b/src/test/python/apache/aurora/common/BUILD
@@ -13,8 +13,6 @@
#
python_tests(
- name = 'common',
- sources = globs('*.py'),
dependencies = [
'3rdparty/python:mock',
'3rdparty/python:twitter.common.contextutil',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/aurora/common/health_check/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/common/health_check/BUILD b/src/test/python/apache/aurora/common/health_check/BUILD
index e73f0c0..72719f2 100644
--- a/src/test/python/apache/aurora/common/health_check/BUILD
+++ b/src/test/python/apache/aurora/common/health_check/BUILD
@@ -13,8 +13,6 @@
#
python_tests(
- name = 'health_check',
- sources = globs('*py'),
dependencies = [
'3rdparty/python:mock',
'3rdparty/python:mox',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/aurora/config/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/config/BUILD b/src/test/python/apache/aurora/config/BUILD
index ec7909d..f8e83ce 100644
--- a/src/test/python/apache/aurora/config/BUILD
+++ b/src/test/python/apache/aurora/config/BUILD
@@ -13,8 +13,6 @@
#
python_tests(
- name = 'config',
- sources = globs('*py'),
dependencies = [
'3rdparty/python:requests-mock',
'3rdparty/python:twitter.common.contextutil',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/aurora/executor/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/BUILD b/src/test/python/apache/aurora/executor/BUILD
index d572474..38ddb14 100644
--- a/src/test/python/apache/aurora/executor/BUILD
+++ b/src/test/python/apache/aurora/executor/BUILD
@@ -13,8 +13,6 @@
#
python_tests(
- name = 'executor',
- sources = globs('*.py'),
dependencies = [
'3rdparty/python:mesos.interface',
'3rdparty/python:mock',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/aurora/executor/bin/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/bin/BUILD b/src/test/python/apache/aurora/executor/bin/BUILD
index c9dcb9f..b8a0635 100644
--- a/src/test/python/apache/aurora/executor/bin/BUILD
+++ b/src/test/python/apache/aurora/executor/bin/BUILD
@@ -13,8 +13,6 @@
#
python_tests(
- name = 'bin',
- sources = globs('*.py'),
dependencies = [
'3rdparty/python:mock',
'src/main/python/apache/aurora/executor',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/aurora/executor/common/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/common/BUILD b/src/test/python/apache/aurora/executor/common/BUILD
index 5b79430..e337ebd 100644
--- a/src/test/python/apache/aurora/executor/common/BUILD
+++ b/src/test/python/apache/aurora/executor/common/BUILD
@@ -13,8 +13,6 @@
#
python_tests(
- name = 'common',
- sources = globs('*.py'),
dependencies = [
'3rdparty/python:mesos.interface',
'3rdparty/python:mock',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/aurora/tools/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/tools/BUILD b/src/test/python/apache/aurora/tools/BUILD
index bf3bbf9..a64b360 100644
--- a/src/test/python/apache/aurora/tools/BUILD
+++ b/src/test/python/apache/aurora/tools/BUILD
@@ -13,8 +13,6 @@
#
python_tests(
- name = 'tools',
- sources = globs('*.py'),
dependencies = [
'3rdparty/python:mock',
'src/main/python/apache/aurora/tools:thermos_observer',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/thermos/cli/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/cli/BUILD b/src/test/python/apache/thermos/cli/BUILD
index 401bdba..0ad1306 100644
--- a/src/test/python/apache/thermos/cli/BUILD
+++ b/src/test/python/apache/thermos/cli/BUILD
@@ -13,8 +13,6 @@
#
python_tests(
- name = 'cli',
- sources = globs('*.py'),
dependencies = [
'3rdparty/python:mock',
'src/main/python/apache/thermos/cli',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/thermos/cli/commands/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/cli/commands/BUILD b/src/test/python/apache/thermos/cli/commands/BUILD
index 7ed1d6c..0ad1306 100644
--- a/src/test/python/apache/thermos/cli/commands/BUILD
+++ b/src/test/python/apache/thermos/cli/commands/BUILD
@@ -13,8 +13,6 @@
#
python_tests(
- name = 'commands',
- sources = globs('*.py'),
dependencies = [
'3rdparty/python:mock',
'src/main/python/apache/thermos/cli',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/thermos/common/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/common/BUILD b/src/test/python/apache/thermos/common/BUILD
index b570759..08b008e 100644
--- a/src/test/python/apache/thermos/common/BUILD
+++ b/src/test/python/apache/thermos/common/BUILD
@@ -13,8 +13,6 @@
#
python_tests(
- name = 'common',
- sources = globs('*.py'),
dependencies = [
'3rdparty/python:twitter.common.testing',
'src/main/python/apache/thermos/common',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/thermos/config/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/config/BUILD b/src/test/python/apache/thermos/config/BUILD
index a507157..9044538 100644
--- a/src/test/python/apache/thermos/config/BUILD
+++ b/src/test/python/apache/thermos/config/BUILD
@@ -13,8 +13,6 @@
#
python_tests(
- name = 'config',
- sources = globs('*.py'),
dependencies = [
'3rdparty/python:twitter.common.collections',
'src/main/python/apache/thermos/config',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/thermos/core/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/BUILD b/src/test/python/apache/thermos/core/BUILD
index 957a116..fd2e152 100644
--- a/src/test/python/apache/thermos/core/BUILD
+++ b/src/test/python/apache/thermos/core/BUILD
@@ -13,8 +13,6 @@
#
python_tests(
- name = 'core',
- sources = globs('*.py'),
dependencies = [
'3rdparty/python:mock',
'3rdparty/python:psutil',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/thermos/monitoring/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/monitoring/BUILD b/src/test/python/apache/thermos/monitoring/BUILD
index 8f2b393..cf7c5f0 100644
--- a/src/test/python/apache/thermos/monitoring/BUILD
+++ b/src/test/python/apache/thermos/monitoring/BUILD
@@ -13,8 +13,6 @@
#
python_tests(
- name = 'monitoring',
- sources = globs('*.py'),
dependencies = [
'3rdparty/python:mock',
'3rdparty/python:twitter.common.contextutil',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/thermos/observer/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/observer/BUILD b/src/test/python/apache/thermos/observer/BUILD
index ec391f2..1300e61 100644
--- a/src/test/python/apache/thermos/observer/BUILD
+++ b/src/test/python/apache/thermos/observer/BUILD
@@ -13,8 +13,6 @@
#
python_tests(
- name = 'observer',
- sources = globs('*.py'),
dependencies = [
'3rdparty/python:mock',
'src/main/python/apache/thermos/monitoring',
http://git-wip-us.apache.org/repos/asf/aurora/blob/0c177058/src/test/python/apache/thermos/observer/http/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/observer/http/BUILD b/src/test/python/apache/thermos/observer/http/BUILD
index 708f09b..1300e61 100644
--- a/src/test/python/apache/thermos/observer/http/BUILD
+++ b/src/test/python/apache/thermos/observer/http/BUILD
@@ -13,8 +13,6 @@
#
python_tests(
- name = 'http',
- sources = globs('*.py'),
dependencies = [
'3rdparty/python:mock',
'src/main/python/apache/thermos/monitoring',