aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfarr...@apache.org
Subject [2/2] git commit: AURORA-30: Clean up and coalesce 3rdparty python deps
Date Tue, 28 Jan 2014 02:28:15 GMT
AURORA-30: Clean up and coalesce 3rdparty python deps

Review: https://reviews.apache.org/r/17419/


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/44170174
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/44170174
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/44170174

Branch: refs/heads/master
Commit: 44170174fce4b2e8d624d2a24f89f91ebf2e199a
Parents: c33d837
Author: jfarrell <jfarrell@apache.org>
Authored: Mon Jan 27 21:26:18 2014 -0500
Committer: jfarrell <jfarrell@apache.org>
Committed: Mon Jan 27 21:26:18 2014 -0500

----------------------------------------------------------------------
 3rdparty/python/BUILD                           | 51 +++++++++++++++++
 .../src/python/twitter/common/app/BUILD         |  4 --
 .../src/python/twitter/common/collections/BUILD |  4 --
 .../src/python/twitter/common/concurrent/BUILD  |  4 --
 .../src/python/twitter/common/config/BUILD      |  4 --
 .../src/python/twitter/common/confluence/BUILD  |  4 --
 .../src/python/twitter/common/contextutil/BUILD |  4 --
 .../src/python/twitter/common/decorators/BUILD  |  4 --
 .../src/python/twitter/common/dirutil/BUILD     |  4 --
 .../src/python/twitter/common/exceptions/BUILD  |  4 --
 .../src/python/twitter/common/http/BUILD        |  4 --
 .../src/python/twitter/common/lang/BUILD        |  4 --
 .../src/python/twitter/common/log/BUILD         |  4 --
 .../src/python/twitter/common/metrics/BUILD     |  4 --
 .../src/python/twitter/common/options/BUILD     |  4 --
 .../src/python/twitter/common/process/BUILD     |  4 --
 .../src/python/twitter/common/python/BUILD      |  4 --
 .../src/python/twitter/common/quantity/BUILD    |  4 --
 .../src/python/twitter/common/recordio/BUILD    |  4 --
 .../src/python/twitter/common/rpc/BUILD         |  4 --
 .../python/twitter/common/rpc/transports/BUILD  |  6 --
 .../src/python/twitter/common/string/BUILD      |  4 --
 .../src/python/twitter/common/testing/BUILD     |  4 --
 .../src/python/twitter/common/util/BUILD        |  4 --
 .../src/python/twitter/common/zookeeper/BUILD   | 11 ----
 .../twitter/common/zookeeper/serverset/BUILD    |  6 --
 .../src/python/twitter/thermos/common/BUILD     | 33 -----------
 .../src/python/twitter/thermos/config/BUILD     | 11 ----
 .../src/python/twitter/thermos/core/BUILD       | 40 -------------
 .../src/python/twitter/thermos/monitoring/BUILD | 55 ------------------
 .../src/python/twitter/thermos/observer/BUILD   | 18 ------
 .../src/thrift/com/twitter/thermos/BUILD        |  4 --
 .../src/thrift/com/twitter/thrift/BUILD         |  2 -
 src/main/python/apache/aurora/BUILD.thirdparty  | 19 -------
 src/main/python/apache/aurora/admin/BUILD       |  4 +-
 src/main/python/apache/aurora/client/BUILD      | 14 ++---
 src/main/python/apache/aurora/client/api/BUILD  | 31 +++++-----
 src/main/python/apache/aurora/client/bin/BUILD  |  8 +--
 src/main/python/apache/aurora/client/cli/BUILD  | 14 +++--
 .../python/apache/aurora/client/commands/BUILD  | 18 +++---
 .../python/apache/aurora/client/hooks/BUILD     |  2 +-
 src/main/python/apache/aurora/common/BUILD      | 14 ++---
 src/main/python/apache/aurora/common/auth/BUILD |  4 +-
 src/main/python/apache/aurora/config/BUILD      |  4 +-
 .../python/apache/aurora/config/schema/BUILD    |  2 +-
 src/main/python/apache/aurora/executor/BUILD    | 60 ++++++++++----------
 .../python/apache/aurora/executor/bin/BUILD     | 16 +++---
 .../python/apache/aurora/executor/common/BUILD  | 26 ++++-----
 src/main/python/apache/thermos/BUILD.thirdparty | 34 -----------
 src/main/python/apache/thermos/bin/BUILD        |  8 +--
 src/main/python/apache/thermos/common/BUILD     |  6 +-
 src/main/python/apache/thermos/config/BUILD     |  4 +-
 src/main/python/apache/thermos/core/BUILD       | 36 ++++++------
 src/main/python/apache/thermos/monitoring/BUILD | 36 ++++++------
 src/main/python/apache/thermos/observer/BUILD   | 14 ++---
 .../python/apache/thermos/observer/bin/BUILD    |  8 +--
 .../python/apache/thermos/observer/http/BUILD   | 16 +++---
 src/main/python/apache/thermos/testing/BUILD    |  6 +-
 src/test/python/apache/aurora/admin/BUILD       |  2 +-
 src/test/python/apache/aurora/client/BUILD      |  6 +-
 src/test/python/apache/aurora/client/api/BUILD  | 16 +++---
 src/test/python/apache/aurora/client/cli/BUILD  |  6 +-
 .../python/apache/aurora/client/commands/BUILD  | 14 ++---
 .../python/apache/aurora/client/hooks/BUILD     |  2 +-
 src/test/python/apache/aurora/common/BUILD      |  8 +--
 src/test/python/apache/aurora/config/BUILD      |  4 +-
 src/test/python/apache/aurora/executor/BUILD    | 30 +++++-----
 .../python/apache/aurora/executor/common/BUILD  |  8 +--
 src/test/python/apache/thermos/common/BUILD     |  2 +-
 src/test/python/apache/thermos/config/BUILD     |  2 +-
 src/test/python/apache/thermos/core/BUILD       | 10 ++--
 71 files changed, 282 insertions(+), 557 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/3rdparty/python/BUILD
----------------------------------------------------------------------
diff --git a/3rdparty/python/BUILD b/3rdparty/python/BUILD
new file mode 100644
index 0000000..735a063
--- /dev/null
+++ b/3rdparty/python/BUILD
@@ -0,0 +1,51 @@
+#
+# Copyright 2013 Apache Software Foundation
+#
+# 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.
+#
+
+python_requirement('argparse==1.2.1')
+python_requirement('bottle==0.11.6')
+python_requirement('cherrypy==3.2.2')
+python_requirement('mako==0.4.0')
+python_requirement('mesos-core==0.15.0-rc4')
+python_requirement('mock==1.0.1')
+python_requirement('mox==0.5.3')
+python_requirement('psutil==1.1.2')
+python_requirement('pystachio==0.7.2')
+python_requirement('pyyaml==3.10')
+python_requirement('thrift==0.9.1')
+python_requirement('twitter.common.app==0.1.0')
+python_requirement('twitter.common.collections==0.1.0')
+python_requirement('twitter.common.concurrent==0.1.0')
+python_requirement('twitter.common.config==0.1.0')
+python_requirement('twitter.common.confluence==0.1.0')
+python_requirement('twitter.common.contextutil==0.1.0')
+python_requirement('twitter.common.decorators==0.1.0')
+python_requirement('twitter.common.dirutil==0.1.0')
+python_requirement('twitter.common.exceptions==0.1.0')
+python_requirement('twitter.common.http==0.1.0')
+python_requirement('twitter.common.lang==0.1.0')
+python_requirement('twitter.common.log==0.1.0')
+python_requirement('twitter.common.metrics==0.1.0')
+python_requirement('twitter.common.options==0.1.0')
+python_requirement('twitter.common.process==0.1.0')
+python_requirement('twitter.common.python==0.2.0')
+python_requirement('twitter.common.quantity==0.1.0')
+python_requirement('twitter.common.recordio==0.1.2')
+python_requirement('twitter.common.rpc==0.1.2')
+python_requirement('twitter.common.string==0.1.0')
+python_requirement('twitter.common.testing==0.1.0')
+python_requirement('twitter.common.util==0.1.0')
+python_requirement('twitter.common.zookeeper==0.1.1')
+python_requirement('watchdog==0.7.0')

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/app/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/app/BUILD b/aurora/twitterdeps/src/python/twitter/common/app/BUILD
deleted file mode 100644
index f77fea1..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/app/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'app',
-  requirement = 'twitter.common.app==0.1.0',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/collections/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/collections/BUILD b/aurora/twitterdeps/src/python/twitter/common/collections/BUILD
deleted file mode 100644
index eadff78..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/collections/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'collections',
-  requirement = 'twitter.common.collections==0.1.0',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/concurrent/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/concurrent/BUILD b/aurora/twitterdeps/src/python/twitter/common/concurrent/BUILD
deleted file mode 100644
index bf7e007..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/concurrent/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'concurrent',
-  requirement = 'twitter.common.concurrent==0.1.0',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/config/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/config/BUILD b/aurora/twitterdeps/src/python/twitter/common/config/BUILD
deleted file mode 100644
index fdb09af..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/config/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'config',
-  requirement = 'twitter.common.config==0.1.0',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/confluence/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/confluence/BUILD b/aurora/twitterdeps/src/python/twitter/common/confluence/BUILD
deleted file mode 100644
index cad6ba1..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/confluence/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'confluence',
-  requirement = 'twitter.common.confluence==0.1.0',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/contextutil/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/contextutil/BUILD b/aurora/twitterdeps/src/python/twitter/common/contextutil/BUILD
deleted file mode 100644
index 4baed1d..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/contextutil/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'contextutil',
-  requirement = 'twitter.common.contextutil==0.1.0',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/decorators/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/decorators/BUILD b/aurora/twitterdeps/src/python/twitter/common/decorators/BUILD
deleted file mode 100644
index d2a378b..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/decorators/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'decorators',
-  requirement = 'twitter.common.decorators==0.1.0',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/dirutil/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/dirutil/BUILD b/aurora/twitterdeps/src/python/twitter/common/dirutil/BUILD
deleted file mode 100644
index 199844f..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/dirutil/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'dirutil',
-  requirement = 'twitter.common.dirutil==0.1.0',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/exceptions/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/exceptions/BUILD b/aurora/twitterdeps/src/python/twitter/common/exceptions/BUILD
deleted file mode 100644
index 358a2bd..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/exceptions/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'exceptions',
-  requirement = 'twitter.common.exceptions==0.1.0',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/http/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/http/BUILD b/aurora/twitterdeps/src/python/twitter/common/http/BUILD
deleted file mode 100644
index f4460fc..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/http/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'http',
-  requirement = 'twitter.common.http==0.1.0',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/lang/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/lang/BUILD b/aurora/twitterdeps/src/python/twitter/common/lang/BUILD
deleted file mode 100644
index 471c1e5..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/lang/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'lang',
-  requirement = 'twitter.common.lang==0.1.0',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/log/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/log/BUILD b/aurora/twitterdeps/src/python/twitter/common/log/BUILD
deleted file mode 100644
index 7dcd83e..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/log/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'log',
-  requirement = 'twitter.common.log==0.1.0',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/metrics/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/metrics/BUILD b/aurora/twitterdeps/src/python/twitter/common/metrics/BUILD
deleted file mode 100644
index 25f2104..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/metrics/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'metrics',
-  requirement = 'twitter.common.metrics==0.1.0',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/options/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/options/BUILD b/aurora/twitterdeps/src/python/twitter/common/options/BUILD
deleted file mode 100644
index 6047d26..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/options/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'options',
-  requirement = 'twitter.common.options==0.1.0',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/process/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/process/BUILD b/aurora/twitterdeps/src/python/twitter/common/process/BUILD
deleted file mode 100644
index 661cbec..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/process/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'process',
-  requirement = 'twitter.common.process==0.1.0',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/python/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/python/BUILD b/aurora/twitterdeps/src/python/twitter/common/python/BUILD
deleted file mode 100644
index 88a1eca..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/python/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'python',
-  requirement = 'twitter.common.python==0.2.0',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/quantity/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/quantity/BUILD b/aurora/twitterdeps/src/python/twitter/common/quantity/BUILD
deleted file mode 100644
index 479aaae..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/quantity/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'quantity',
-  requirement = 'twitter.common.quantity==0.1.0',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/recordio/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/recordio/BUILD b/aurora/twitterdeps/src/python/twitter/common/recordio/BUILD
deleted file mode 100644
index 4018def..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/recordio/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'recordio-thrift',
-  requirement = 'twitter.common.recordio==0.1.2',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/rpc/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/rpc/BUILD b/aurora/twitterdeps/src/python/twitter/common/rpc/BUILD
deleted file mode 100644
index 8cc6088..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/rpc/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'rpc',
-  requirement = 'twitter.common.rpc==0.1.2',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/rpc/transports/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/rpc/transports/BUILD b/aurora/twitterdeps/src/python/twitter/common/rpc/transports/BUILD
deleted file mode 100644
index 1953302..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/rpc/transports/BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-python_library(
-  name = 'tsslsocket',
-  dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/rpc'),
-  ],
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/string/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/string/BUILD b/aurora/twitterdeps/src/python/twitter/common/string/BUILD
deleted file mode 100644
index ed5b958..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/string/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'string',
-  requirement = 'twitter.common.string==0.1.0',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/testing/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/testing/BUILD b/aurora/twitterdeps/src/python/twitter/common/testing/BUILD
deleted file mode 100644
index 3d28b4b..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/testing/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'testing',
-  requirement = 'twitter.common.testing==0.1.0',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/util/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/util/BUILD b/aurora/twitterdeps/src/python/twitter/common/util/BUILD
deleted file mode 100644
index 807a053..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/util/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'util',
-  requirement = 'twitter.common.util==0.1.0',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/zookeeper/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/zookeeper/BUILD b/aurora/twitterdeps/src/python/twitter/common/zookeeper/BUILD
deleted file mode 100644
index f0a02ef..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/zookeeper/BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-python_requirement(
-  name = 'zookeeper',
-  requirement = 'twitter.common.zookeeper==0.1.1',
-)
-
-python_library(
-  name = 'kazoo_client',
-  dependencies = [
-    pants(':zookeeper'),
-  ],
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/common/zookeeper/serverset/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/common/zookeeper/serverset/BUILD b/aurora/twitterdeps/src/python/twitter/common/zookeeper/serverset/BUILD
deleted file mode 100644
index 11cb77e..0000000
--- a/aurora/twitterdeps/src/python/twitter/common/zookeeper/serverset/BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-python_library(
-  name = 'kazoo_serverset',
-  dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/zookeeper'),
-  ],
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/thermos/common/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/thermos/common/BUILD b/aurora/twitterdeps/src/python/twitter/thermos/common/BUILD
deleted file mode 100644
index b04ed68..0000000
--- a/aurora/twitterdeps/src/python/twitter/thermos/common/BUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-python_requirement(
-  name = 'common',
-  requirement = 'twitter.thermos.common==0.1.0',
-)
-
-# sub-targets in the thermos tree
-python_library(
-  name = 'ckpt',
-  dependencies = [
-    pants(':common'),
-  ]
-)
-
-python_library(
-  name = 'options',
-  dependencies = [
-    pants(':common'),
-  ]
-)
-
-python_library(
-  name = 'path',
-  dependencies = [
-    pants(':common'),
-  ]
-)
-
-python_library(
-  name = 'planner',
-  dependencies = [
-    pants(':common'),
-  ]
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/thermos/config/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/thermos/config/BUILD b/aurora/twitterdeps/src/python/twitter/thermos/config/BUILD
deleted file mode 100644
index 4b66553..0000000
--- a/aurora/twitterdeps/src/python/twitter/thermos/config/BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-python_requirement(
-  name = 'config',
-  requirement = 'twitter.thermos.config==0.1.0',
-)
-
-python_library(
-  name = 'schema',
-  dependencies = [
-    pants(':config'),
-  ]
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/thermos/core/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/thermos/core/BUILD b/aurora/twitterdeps/src/python/twitter/thermos/core/BUILD
deleted file mode 100644
index 3039970..0000000
--- a/aurora/twitterdeps/src/python/twitter/thermos/core/BUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-python_requirement(
-  name = 'core',
-  requirement = 'twitter.thermos.core==0.1.0',
-)
-
-# sub-targets in thermos core tree
-python_library(
-  name = 'helper',
-  dependencies = [
-    pants(':core'),
-  ]
-)
-
-python_library(
-  name = 'inspector',
-  dependencies = [
-    pants(':core'),
-  ]
-)
-
-python_library(
-  name = 'muxer',
-  dependencies = [
-    pants(':core'),
-  ]
-)
-
-python_library(
-  name = 'process',
-  dependencies = [
-    pants(':core'),
-  ]
-)
-
-python_library(
-  name = 'runner',
-  dependencies = [
-    pants(':core'),
-  ]
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/thermos/monitoring/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/thermos/monitoring/BUILD b/aurora/twitterdeps/src/python/twitter/thermos/monitoring/BUILD
deleted file mode 100644
index b5f6d0c..0000000
--- a/aurora/twitterdeps/src/python/twitter/thermos/monitoring/BUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-python_requirement(
-  name = 'monitoring',
-  requirement = 'twitter.thermos.monitoring==0.1.0',
-)
-
-
-# sub-targets for thermos monitoring module
-python_library(
-  name = 'detector',
-  dependencies = [
-    pants(':monitoring'),
-  ]
-)
-
-python_library(
-  name = 'garbage',
-  dependencies = [
-    pants(':monitoring'),
-  ]
-)
-
-python_library(
-  name = 'monitor',
-  dependencies = [
-    pants(':monitoring'),
-  ]
-)
-
-python_library(
-  name = 'disk',
-  dependencies = [
-    pants(':monitoring'),
-  ]
-)
-
-python_library(
-  name = 'process',
-  dependencies = [
-    pants(':monitoring'),
-  ]
-)
-
-python_library(
-  name = 'process_collector_psutil',
-  dependencies = [
-    pants(':monitoring'),
-  ]
-)
-
-python_library(
-  name = 'resource',
-  dependencies = [
-    pants(':monitoring'),
-  ]
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/python/twitter/thermos/observer/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/python/twitter/thermos/observer/BUILD b/aurora/twitterdeps/src/python/twitter/thermos/observer/BUILD
deleted file mode 100644
index 5861a73..0000000
--- a/aurora/twitterdeps/src/python/twitter/thermos/observer/BUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-python_requirement(
-  name = 'observer',
-  requirement = 'twitter.thermos.observer==0.1.0',
-)
-
-python_library(
-  name = 'observed_task',
-  dependencies = [
-    pants(':observer'),
-  ]
-)
-
-python_library(
-  name = 'task_observer',
-  dependencies = [
-    pants(':observer'),
-  ]
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/thrift/com/twitter/thermos/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/thrift/com/twitter/thermos/BUILD b/aurora/twitterdeps/src/thrift/com/twitter/thermos/BUILD
deleted file mode 100644
index 8a9f8b8..0000000
--- a/aurora/twitterdeps/src/thrift/com/twitter/thermos/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-python_requirement(
-  name = 'py-thrift',
-  requirement = 'twitter.gen.thermos==0.1.0',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/aurora/twitterdeps/src/thrift/com/twitter/thrift/BUILD
----------------------------------------------------------------------
diff --git a/aurora/twitterdeps/src/thrift/com/twitter/thrift/BUILD b/aurora/twitterdeps/src/thrift/com/twitter/thrift/BUILD
deleted file mode 100644
index 400827c..0000000
--- a/aurora/twitterdeps/src/thrift/com/twitter/thrift/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-jar_library(name = 'thrift',
-            dependencies = [jar(org='com.twitter.common', name='service-thrift', rev='1.0.25').with_sources()])

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/src/main/python/apache/aurora/BUILD.thirdparty
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/BUILD.thirdparty b/src/main/python/apache/aurora/BUILD.thirdparty
deleted file mode 100644
index 7a43aca..0000000
--- a/src/main/python/apache/aurora/BUILD.thirdparty
+++ /dev/null
@@ -1,19 +0,0 @@
-def make_dep(name, version, dependency_name=None):
-  """Build a target from a specified dependency tuple.
-
-    name is the target name, specified in other BUILD files.
-    version is a hardcoded version string
-    dependency_name is used to identify the specific binary to resolve
-  """
-  dependency_name = dependency_name or name
-  versioned_name = "%s==%s" % (dependency_name, version)
-  python_requirement(requirement=versioned_name, name=name)
-
-make_dep('argparse', '1.2.1')
-make_dep('mesos-core', '0.15.0-rc4', 'mesos')
-make_dep('mock', '1.0.1')
-make_dep('mox', '0.5.3')
-make_dep('psutil', '1.1.2')
-make_dep('pystachio', '0.7.2')
-make_dep('pyyaml', '3.10', 'PyYAML')
-make_dep('thrift', '0.9.1')

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 530b0cb..480dad6 100644
--- a/src/main/python/apache/aurora/admin/BUILD
+++ b/src/main/python/apache/aurora/admin/BUILD
@@ -18,8 +18,8 @@ python_library(
   name = 'mesos_maintenance',
   sources = 'mesos_maintenance.py',
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.quantity'),
     pants('src/main/python/apache/aurora/client:api'),
     pants('src/main/python/apache/aurora/client:base'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 1c967a5..11ad955 100644
--- a/src/main/python/apache/aurora/client/BUILD
+++ b/src/main/python/apache/aurora/client/BUILD
@@ -28,8 +28,8 @@ python_library(
   name = 'base',
   sources = ['base.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/app'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
+    pants('3rdparty/python:twitter.common.app'),
+    pants('3rdparty/python:twitter.common.log'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ]
 )
@@ -38,7 +38,7 @@ python_library(
   name = 'binding_helper',
   sources = ['binding_helper.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/lang'),
+    pants('3rdparty/python:twitter.common.lang'),
   ]
 )
 
@@ -46,11 +46,11 @@ python_library(
   name = 'config',
   sources = ['config.py'],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:pystachio'),
     pants(':base'),
     pants(':binding_helper'),
-    pants('aurora/twitterdeps/src/python/twitter/common/app'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
+    pants('3rdparty/python:pystachio'),
+    pants('3rdparty/python:twitter.common.app'),
+    pants('3rdparty/python:twitter.common.log'),
     pants('src/main/python/apache/aurora/config'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ]
@@ -61,7 +61,7 @@ python_library(
   sources = ['factory.py'],
   dependencies = [
     pants(':base'),
-    pants('aurora/twitterdeps/src/python/twitter/common/app'),
+    pants('3rdparty/python:twitter.common.app'),
     pants('src/main/python/apache/aurora/client/hooks'),
     pants('src/main/python/apache/aurora/common:cluster'),
     pants('src/main/python/apache/aurora/common:clusters'),

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/src/main/python/apache/aurora/client/api/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/BUILD b/src/main/python/apache/aurora/client/api/BUILD
index 358205e..69229a8 100644
--- a/src/main/python/apache/aurora/client/api/BUILD
+++ b/src/main/python/apache/aurora/client/api/BUILD
@@ -21,8 +21,8 @@ python_library(
     pants(':restarter'),
     pants(':scheduler_client'),
     pants(':updater'),
-    pants('aurora/twitterdeps/src/python/twitter/common/lang'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
+    pants('3rdparty/python:twitter.common.lang'),
+    pants('3rdparty/python:twitter.common.log'),
     pants('src/main/python/apache/aurora/common'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ]
@@ -32,8 +32,8 @@ python_library(
   name = 'command_runner',
   sources = ['command_runner.py'],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:pystachio'),
     pants(':api'),
+    pants('3rdparty/python:pystachio'),
     pants('src/main/python/apache/thermos/config:schema'),
     pants('src/main/python/apache/aurora/common:cluster'),
     pants('src/main/python/apache/aurora/config:schema'),
@@ -46,7 +46,7 @@ python_library(
   sources = ['disambiguator.py'],
   dependencies = [
     pants(':api'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
+    pants('3rdparty/python:twitter.common.log'),
     pants('src/main/python/apache/aurora/client:base'),
     pants('src/main/python/apache/aurora/common'),
   ]
@@ -56,7 +56,7 @@ python_library(
   name = 'job_monitor',
   sources = ['job_monitor.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
+    pants('3rdparty/python:twitter.common.quantity'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ]
 )
@@ -67,7 +67,7 @@ python_library(
   dependencies = [
     pants(':instance_watcher'),
     pants(':updater_util'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
+    pants('3rdparty/python:twitter.common.log'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ]
 )
@@ -76,11 +76,10 @@ python_library(
   name = 'scheduler_client',
   sources = ['scheduler_client.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
-    pants('aurora/twitterdeps/src/python/twitter/common/rpc/transports:tsslsocket'),
-    pants('aurora/twitterdeps/src/python/twitter/common/zookeeper/serverset:kazoo_serverset'),
-    pants('aurora/twitterdeps/src/python/twitter/common/zookeeper:kazoo_client'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.quantity'),
+    pants('3rdparty/python:twitter.common.rpc'),
+    pants('3rdparty/python:twitter.common.zookeeper'),
     pants('src/main/python/apache/aurora/common/auth'),
     pants('src/main/python/apache/aurora/common:cluster'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
@@ -92,8 +91,8 @@ python_library(
   sources = ['instance_watcher.py', 'health_check.py'],
   dependencies = [
     pants(':scheduler_client'),
-    pants('aurora/twitterdeps/src/python/twitter/common/lang'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
+    pants('3rdparty/python:twitter.common.lang'),
+    pants('3rdparty/python:twitter.common.log'),
     pants('src/main/python/apache/aurora/common:http_signaler'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ]
@@ -104,7 +103,7 @@ python_library(
   sources = ['quota_check.py'],
   dependencies = [
     pants(':scheduler_client'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
+    pants('3rdparty/python:twitter.common.log'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ]
 )
@@ -117,7 +116,7 @@ python_library(
     pants(':instance_watcher'),
     pants(':updater_util'),
     pants(':quota_check'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
+    pants('3rdparty/python:twitter.common.log'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ]
 )
@@ -126,6 +125,6 @@ python_library(
   name = 'updater_util',
   sources = ['updater_util.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
+    pants('3rdparty/python:twitter.common.log'),
   ]
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/src/main/python/apache/aurora/client/bin/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/bin/BUILD b/src/main/python/apache/aurora/client/bin/BUILD
index 46695b4..19fd9d3 100644
--- a/src/main/python/apache/aurora/client/bin/BUILD
+++ b/src/main/python/apache/aurora/client/bin/BUILD
@@ -19,8 +19,8 @@ python_binary(
   source = 'aurora_client.py',
   entry_point = 'apache.aurora.client.bin.aurora_client:proxy_main',
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/app'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
+    pants('3rdparty/python:twitter.common.app'),
+    pants('3rdparty/python:twitter.common.log'),
     pants('src/main/python/apache/aurora/client/commands:all'),
     pants('src/main/python/apache/aurora/client:base'),
   ]
@@ -31,8 +31,8 @@ python_binary(
   source = 'aurora_admin.py',
   entry_point = 'apache.aurora.client.bin.aurora_admin:proxy_main',
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/app'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
+    pants('3rdparty/python:twitter.common.app'),
+    pants('3rdparty/python:twitter.common.log'),
     pants('src/main/python/apache/aurora/client/commands:admin'),
     pants('src/main/python/apache/aurora/client/commands:help'),
     pants('src/main/python/apache/aurora/client:base'),

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/src/main/python/apache/aurora/client/cli/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/BUILD b/src/main/python/apache/aurora/client/cli/BUILD
index 8828c1e..1019e00 100644
--- a/src/main/python/apache/aurora/client/cli/BUILD
+++ b/src/main/python/apache/aurora/client/cli/BUILD
@@ -17,14 +17,17 @@
 python_binary(
   name='client',
   entry_point = 'apache.aurora.cli:main',
-  dependencies = [ pants(':cli') ],
-  )
+  dependencies = [
+    pants(':cli'),
+  ],
+)
 
 python_library(
   name='cli',
   sources = [ '__init__.py', 'context.py', 'jobs.py', 'options.py' ],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/python'),
+    pants('3rdparty/python:argparse'),
+    pants('3rdparty/python:twitter.common.python'),
     pants('src/main/python/apache/aurora/client/api:command_runner'),
     pants('src/main/python/apache/aurora/client/api:disambiguator'),
     pants('src/main/python/apache/aurora/client/api:job_monitor'),
@@ -36,6 +39,5 @@ python_library(
     pants('src/main/python/apache/aurora/client:options'),
     pants('src/main/python/apache/aurora/common'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
-    pants('src/main/python/apache/aurora:argparse')
-    ]
-  )
+  ],
+)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/src/main/python/apache/aurora/client/commands/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/commands/BUILD b/src/main/python/apache/aurora/client/commands/BUILD
index e2322b8..14bbdd4 100644
--- a/src/main/python/apache/aurora/client/commands/BUILD
+++ b/src/main/python/apache/aurora/client/commands/BUILD
@@ -28,9 +28,9 @@ python_library(
   name = 'admin',
   sources = ['admin.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/app'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
+    pants('3rdparty/python:twitter.common.app'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.quantity'),
     pants('src/main/python/apache/aurora/admin:mesos_maintenance'),
     pants('src/main/python/apache/aurora/client/api'),
     pants('src/main/python/apache/aurora/client:base'),
@@ -43,9 +43,9 @@ python_library(
   name = 'core',
   sources = ['core.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/app'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/python'),
+    pants('3rdparty/python:twitter.common.app'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.python'),
     pants('src/main/python/apache/aurora/client/api:command_runner'),
     pants('src/main/python/apache/aurora/client/api:disambiguator'),
     pants('src/main/python/apache/aurora/client/api:job_monitor'),
@@ -65,7 +65,7 @@ python_library(
   name = 'help',
   sources = ['help.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/app'),
+    pants('3rdparty/python:twitter.common.app'),
     pants('src/main/python/apache/aurora/client:base'),
   ]
 )
@@ -74,7 +74,7 @@ python_library(
   name = 'run',
   sources = ['run.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/app'),
+    pants('3rdparty/python:twitter.common.app'),
     pants('src/main/python/apache/aurora/client/api:command_runner'),
     pants('src/main/python/apache/aurora/client:base'),
     pants('src/main/python/apache/aurora/client:options'),
@@ -87,7 +87,7 @@ python_library(
   name = 'ssh',
   sources = ['ssh.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/app'),
+    pants('3rdparty/python:twitter.common.app'),
     pants('src/main/python/apache/aurora/client/api:command_runner'),
     pants('src/main/python/apache/aurora/client:base'),
     pants('src/main/python/apache/aurora/client:factory'),

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/src/main/python/apache/aurora/client/hooks/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/hooks/BUILD b/src/main/python/apache/aurora/client/hooks/BUILD
index d181f52..7ac267b 100644
--- a/src/main/python/apache/aurora/client/hooks/BUILD
+++ b/src/main/python/apache/aurora/client/hooks/BUILD
@@ -18,7 +18,7 @@ python_library(
   name = 'hooks',
   sources = ['__init__.py', 'hooked_api.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
+    pants('3rdparty/python:twitter.common.log'),
     pants('src/main/python/apache/aurora/client:api'),
     pants('src/main/python/apache/aurora/common:aurora_job_key'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 860667e..ce73f93 100644
--- a/src/main/python/apache/aurora/common/BUILD
+++ b/src/main/python/apache/aurora/common/BUILD
@@ -20,7 +20,7 @@ python_library(
   name = 'aurora_job_key',
   sources = ['aurora_job_key.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/lang'),
+    pants('3rdparty/python:twitter.common.lang'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ]
 )
@@ -29,7 +29,7 @@ python_library(
   name = 'cluster',
   sources = ['cluster.py'],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:pystachio'),
+    pants('3rdparty/python:pystachio'),
   ]
 )
 
@@ -38,8 +38,8 @@ python_library(
   sources = ['clusters.py'],
   dependencies = [
     pants(':cluster'),
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:pystachio'),
-    pants('aurora/twitterdeps/src/python/twitter/common/collections'),
+    pants('3rdparty/python:pystachio'),
+    pants('3rdparty/python:twitter.common.collections'),
   ]
 )
 
@@ -47,7 +47,7 @@ python_library(
   name = 'cluster_option',
   sources = ['cluster_option.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/lang'),
+    pants('3rdparty/python:twitter.common.lang'),
   ]
 )
 
@@ -55,8 +55,8 @@ python_library(
   name = 'http_signaler',
   sources = ['http_signaler.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/lang'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
+    pants('3rdparty/python:twitter.common.lang'),
+    pants('3rdparty/python:twitter.common.log'),
   ]
 )
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/src/main/python/apache/aurora/common/auth/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/common/auth/BUILD b/src/main/python/apache/aurora/common/auth/BUILD
index bd47654..9395277 100644
--- a/src/main/python/apache/aurora/common/auth/BUILD
+++ b/src/main/python/apache/aurora/common/auth/BUILD
@@ -18,8 +18,8 @@ python_library(
   name = 'auth',
   sources = globs('*.py'),
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/lang'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
+    pants('3rdparty/python:twitter.common.lang'),
+    pants('3rdparty/python:twitter.common.log'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ]
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 39df20f..d746728 100644
--- a/src/main/python/apache/aurora/config/BUILD
+++ b/src/main/python/apache/aurora/config/BUILD
@@ -33,8 +33,8 @@ python_library(
     'thrift.py',
   ),
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:pystachio'),
-    pants('aurora/twitterdeps/src/python/twitter/common/lang'),
+    pants('3rdparty/python:pystachio'),
+    pants('3rdparty/python:twitter.common.lang'),
     pants('src/main/python/apache/aurora/common'),
     pants('src/main/python/apache/aurora/config/schema'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/src/main/python/apache/aurora/config/schema/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/config/schema/BUILD b/src/main/python/apache/aurora/config/schema/BUILD
index 78e74d8..18aeabe 100644
--- a/src/main/python/apache/aurora/config/schema/BUILD
+++ b/src/main/python/apache/aurora/config/schema/BUILD
@@ -18,7 +18,7 @@ python_library(
   name = 'schema',
   sources = ['base.py'],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:pystachio'),
+    pants('3rdparty/python:pystachio'),
     pants('src/main/python/apache/thermos/config:schema'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ]

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 8037330..2524b2e 100644
--- a/src/main/python/apache/aurora/executor/BUILD
+++ b/src/main/python/apache/aurora/executor/BUILD
@@ -20,9 +20,9 @@ python_library(
   name = 'thermos_task_runner',
   sources = ['thermos_task_runner.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/dirutil'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
+    pants('3rdparty/python:twitter.common.dirutil'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.quantity'),
     pants('src/main/python/apache/thermos/common'),
     pants('src/main/python/apache/thermos/config:schema'),
     pants('src/main/python/apache/thermos/core'),
@@ -38,7 +38,7 @@ python_library(
   name = 'executor_detector',
   sources = ['executor_detector.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/string'),
+    pants('3rdparty/python:twitter.common.string'),
   ]
 )
 
@@ -46,12 +46,12 @@ python_library(
   name = 'executor_vars',
   sources = ['executor_vars.py'],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:psutil'),
-    pants('aurora/twitterdeps/src/python/twitter/common/exceptions'),
-    pants('aurora/twitterdeps/src/python/twitter/common/metrics'),
-    pants('aurora/twitterdeps/src/python/twitter/common/python'),
-    pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
-    pants('aurora/twitterdeps/src/python/twitter/common/string'),
+    pants('3rdparty/python:psutil'),
+    pants('3rdparty/python:twitter.common.exceptions'),
+    pants('3rdparty/python:twitter.common.metrics'),
+    pants('3rdparty/python:twitter.common.python'),
+    pants('3rdparty/python:twitter.common.quantity'),
+    pants('3rdparty/python:twitter.common.string'),
   ]
 )
 
@@ -59,9 +59,9 @@ python_library(
   name = 'status_manager',
   sources = ['status_manager.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/exceptions'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
+    pants('3rdparty/python:twitter.common.exceptions'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.quantity'),
     pants('src/main/python/apache/aurora/executor/common:status_checker'),
   ]
 )
@@ -70,9 +70,9 @@ python_library(
   name = 'thermos_executor_base',
   sources = ['executor_base.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
+    pants('3rdparty/python:mesos-core'),
+    pants('3rdparty/python:twitter.common.log'),
     pants('src/main/thrift/org/apache/thermos:py-thrift'),
-    pants('src/main/python/apache/aurora:mesos-core'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ]
 )
@@ -81,18 +81,18 @@ python_library(
   name = 'thermos_executor',
   sources = ['thermos_executor.py'],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:pystachio'),
     pants(':status_manager'),
     pants(':thermos_executor_base'),
-    pants('aurora/twitterdeps/src/python/twitter/common/app'),
-    pants('aurora/twitterdeps/src/python/twitter/common/concurrent'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
+    pants('3rdparty/python:mesos-core'),
+    pants('3rdparty/python:pystachio'),
+    pants('3rdparty/python:twitter.common.app'),
+    pants('3rdparty/python:twitter.common.concurrent'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.quantity'),
     pants('src/main/python/apache/aurora/executor/common:kill_manager'),
     pants('src/main/python/apache/aurora/executor/common:sandbox'),
     pants('src/main/python/apache/aurora/executor/common:task_info'),
     pants('src/main/python/apache/aurora/executor/common:task_runner'),
-    pants('src/main/python/apache/aurora:mesos-core'),
   ]
 )
 
@@ -100,8 +100,8 @@ python_library(
   name = 'thermos_runner',
   sources = ['thermos_runner.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/app'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
+    pants('3rdparty/python:twitter.common.app'),
+    pants('3rdparty/python:twitter.common.log'),
     pants('src/main/python/apache/thermos/common:planner'),
     pants('src/main/python/apache/thermos/config:schema'),
     pants('src/main/python/apache/thermos/core'),
@@ -112,14 +112,15 @@ python_library(
   name = 'gc_executor',
   sources = ['gc_executor.py'],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:psutil'),
     pants(':executor_detector'),
     pants(':thermos_executor_base'),
-    pants('aurora/twitterdeps/src/python/twitter/common/collections'),
-    pants('aurora/twitterdeps/src/python/twitter/common/exceptions'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/metrics'),
-    pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
+    pants('3rdparty/python:mesos-core'),
+    pants('3rdparty/python:psutil'),
+    pants('3rdparty/python:twitter.common.collections'),
+    pants('3rdparty/python:twitter.common.exceptions'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.metrics'),
+    pants('3rdparty/python:twitter.common.quantity'),
     pants('src/main/python/apache/thermos/common:ckpt'),
     pants('src/main/python/apache/thermos/common:path'),
     pants('src/main/python/apache/thermos/core:helper'),
@@ -128,7 +129,6 @@ python_library(
     pants('src/main/python/apache/thermos/monitoring:garbage'),
     pants('src/main/python/apache/aurora/config:schema'),
     pants('src/main/python/apache/aurora/executor/common:sandbox'),
-    pants('src/main/python/apache/aurora:mesos-core'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ]
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/src/main/python/apache/aurora/executor/bin/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/bin/BUILD b/src/main/python/apache/aurora/executor/bin/BUILD
index 91cc910..2dcc69b 100644
--- a/src/main/python/apache/aurora/executor/bin/BUILD
+++ b/src/main/python/apache/aurora/executor/bin/BUILD
@@ -21,9 +21,9 @@ python_binary(
   ignore_errors = True,
   always_write_cache = True,
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/app'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/metrics'),
+    pants('3rdparty/python:twitter.common.app'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.metrics'),
     pants('src/main/python/apache/aurora/executor/common:executor_timeout'),
     pants('src/main/python/apache/aurora/executor/common:health_checker'),
     pants('src/main/python/apache/aurora/executor/common:sandbox'),
@@ -41,9 +41,9 @@ python_binary(
   ignore_errors = True,
   always_write_cache = True,
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/app'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/metrics'),
+    pants('3rdparty/python:twitter.common.app'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.metrics'),
     pants('src/main/python/apache/thermos/common:path'),
     pants('src/main/python/apache/aurora/executor:executor_detector'),
     pants('src/main/python/apache/aurora/executor:executor_vars'),
@@ -56,8 +56,8 @@ python_binary(
   source = 'thermos_runner_main.py',
   entry_point = 'apache.aurora.executor.bin.thermos_runner_main:proxy_main',
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/app'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
+    pants('3rdparty/python:twitter.common.app'),
+    pants('3rdparty/python:twitter.common.log'),
     pants('src/main/python/apache/aurora/executor:thermos_runner'),
   ],
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/src/main/python/apache/aurora/executor/common/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/common/BUILD b/src/main/python/apache/aurora/executor/common/BUILD
index ecbcf46..c21d58e 100644
--- a/src/main/python/apache/aurora/executor/common/BUILD
+++ b/src/main/python/apache/aurora/executor/common/BUILD
@@ -18,9 +18,9 @@ python_library(
   name = 'status_checker',
   sources = ['status_checker.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/lang'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/metrics'),
+    pants('3rdparty/python:twitter.common.lang'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.metrics'),
   ]
 )
 
@@ -29,7 +29,7 @@ python_library(
   sources = ['task_runner.py'],
   dependencies = [
     pants(':status_checker'),
-    pants('aurora/twitterdeps/src/python/twitter/common/lang'),
+    pants('3rdparty/python:twitter.common.lang'),
   ]
 )
 
@@ -39,8 +39,8 @@ python_library(
   dependencies = [
     pants(':status_checker'),
     pants(':task_info'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/exceptions'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.exceptions'),
     pants('src/main/python/apache/aurora/common:http_signaler'),
   ]
 )
@@ -49,9 +49,9 @@ python_library(
   name = 'executor_timeout',
   sources = ['executor_timeout.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/exceptions'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
+    pants('3rdparty/python:twitter.common.exceptions'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.quantity'),
   ]
 )
 
@@ -67,8 +67,8 @@ python_library(
   name = 'sandbox',
   sources = ['sandbox.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/dirutil'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
+    pants('3rdparty/python:twitter.common.dirutil'),
+    pants('3rdparty/python:twitter.common.log'),
   ]
 )
 
@@ -76,8 +76,8 @@ python_library(
   name = 'task_info',
   sources = ['task_info.py'],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:pystachio'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
+    pants('3rdparty/python:pystachio'),
+    pants('3rdparty/python:twitter.common.log'),
     pants('src/main/python/apache/aurora/config'),
     pants('src/main/python/apache/aurora/config/schema'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/src/main/python/apache/thermos/BUILD.thirdparty
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/BUILD.thirdparty b/src/main/python/apache/thermos/BUILD.thirdparty
deleted file mode 100644
index 5a54f4a..0000000
--- a/src/main/python/apache/thermos/BUILD.thirdparty
+++ /dev/null
@@ -1,34 +0,0 @@
-python_requirement(
-  name = 'psutil',
-  requirement = 'psutil==1.1.2',
-)
-
-python_requirement(
-  name = 'pystachio',
-  requirement = 'pystachio==0.7.2',
-)
-
-python_requirement(
-  name = 'mako',
-  requirement = 'mako==0.4.0',
-)
-
-python_requirement(
-  name = 'cherrypy',
-  requirement = 'cherrypy==3.2.2',
-)
-
-python_requirement(
-  name = 'bottle',
-  requirement = 'bottle==0.11.6',
-)
-
-python_requirement(
-  name = 'thrift',
-  requirement = 'thrift==0.9.1',
-)
-
-python_requirement(
-  name = 'mock',
-  requirement = 'mock==1.0.1',
-)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/src/main/python/apache/thermos/bin/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/bin/BUILD b/src/main/python/apache/thermos/bin/BUILD
index 4b2975f..7a1ffdd 100644
--- a/src/main/python/apache/thermos/bin/BUILD
+++ b/src/main/python/apache/thermos/bin/BUILD
@@ -18,8 +18,8 @@ python_binary(
   name = 'thermos_ckpt',
   source = 'thermos_ckpt.py',
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/app'),
-    pants('aurora/twitterdeps/src/python/twitter/common/recordio:recordio-thrift'),
+    pants('3rdparty/python:twitter.common.app'),
+    pants('3rdparty/python:twitter.common.recordio'),
     pants('src/main/python/apache/thermos/common'),
     pants('src/main/thrift/org/apache/thermos:py-thrift')
   ]
@@ -29,8 +29,8 @@ python_binary(
   name = 'thermos',
   source = 'thermos.py',
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/app'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
+    pants('3rdparty/python:twitter.common.app'),
+    pants('3rdparty/python:twitter.common.log'),
     pants('src/main/python/apache/thermos/common'),
     pants('src/main/python/apache/thermos/config:schema'),
     pants('src/main/python/apache/thermos/core'),

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 2981286..a256f2e 100644
--- a/src/main/python/apache/thermos/common/BUILD
+++ b/src/main/python/apache/thermos/common/BUILD
@@ -20,8 +20,8 @@ python_library(
   name = 'ckpt',
   sources = ['ckpt.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/recordio:recordio-thrift'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.recordio'),
     pants('src/main/thrift/org/apache/thermos:py-thrift')
   ]
 )
@@ -40,7 +40,7 @@ python_library(
   name = 'options',
   sources = ['options.py'],
   dependencies = [
-    pants('src/main/python/apache/thermos:pystachio'),
+    pants('3rdparty/python:pystachio'),
     pants('src/main/thrift/org/apache/thermos:py-thrift'),
   ]
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 6fdd55e..b080605 100644
--- a/src/main/python/apache/thermos/config/BUILD
+++ b/src/main/python/apache/thermos/config/BUILD
@@ -20,8 +20,8 @@ python_library(
   name = 'schema',
   sources = globs('*.py'),
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/lang'),
-    pants('src/main/python/apache/thermos:pystachio'),
+    pants('3rdparty/python:pystachio'),
+    pants('3rdparty/python:twitter.common.lang'),
     pants('src/main/python/apache/thermos/common:planner')
   ],
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 0e86be7..6da1a61 100644
--- a/src/main/python/apache/thermos/core/BUILD
+++ b/src/main/python/apache/thermos/core/BUILD
@@ -20,11 +20,11 @@ python_library(
   name = 'helper',
   sources = ['helper.py'],
   dependencies = [
-    pants('src/main/python/apache/thermos:psutil'),
-    pants('aurora/twitterdeps/src/python/twitter/common/dirutil'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
-    pants('aurora/twitterdeps/src/python/twitter/common/recordio:recordio-thrift'),
+    pants('3rdparty/python:psutil'),
+    pants('3rdparty/python:twitter.common.dirutil'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.quantity'),
+    pants('3rdparty/python:twitter.common.recordio'),
     pants('src/main/python/apache/thermos/common:ckpt'),
     pants('src/main/python/apache/thermos/common:path'),
     pants('src/main/thrift/org/apache/thermos:py-thrift'),
@@ -36,7 +36,7 @@ python_library(
   sources = ['inspector.py'],
   dependencies = [
     pants(':muxer'),
-    pants('aurora/twitterdeps/src/python/twitter/common/recordio:recordio-thrift'),
+    pants('3rdparty/python:twitter.common.recordio'),
     pants('src/main/python/apache/thermos/common:ckpt'),
     pants('src/main/python/apache/thermos/common:path'),
     pants('src/main/thrift/org/apache/thermos:py-thrift'),
@@ -47,8 +47,8 @@ python_library(
   name = 'muxer',
   sources = ['muxer.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/recordio:recordio-thrift'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.recordio'),
     pants('src/main/thrift/org/apache/thermos:py-thrift'),
   ]
 )
@@ -57,11 +57,11 @@ python_library(
   name = 'process',
   sources = ['process.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/dirutil'),
-    pants('aurora/twitterdeps/src/python/twitter/common/lang'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
-    pants('aurora/twitterdeps/src/python/twitter/common/recordio:recordio-thrift'),
+    pants('3rdparty/python:twitter.common.dirutil'),
+    pants('3rdparty/python:twitter.common.lang'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.quantity'),
+    pants('3rdparty/python:twitter.common.recordio'),
     pants('src/main/thrift/org/apache/thermos:py-thrift'),
   ]
 )
@@ -73,11 +73,11 @@ python_library(
     pants(':helper'),
     pants(':muxer'),
     pants(':process'),
-    pants('aurora/twitterdeps/src/python/twitter/common/dirutil'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
-    pants('aurora/twitterdeps/src/python/twitter/common/recordio:recordio-thrift'),
-    pants('src/main/python/apache/thermos:psutil'),
+    pants('3rdparty/python:psutil'),
+    pants('3rdparty/python:twitter.common.dirutil'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.quantity'),
+    pants('3rdparty/python:twitter.common.recordio'),
     pants('src/main/python/apache/thermos/common:ckpt'),
     pants('src/main/python/apache/thermos/common:path'),
     pants('src/main/python/apache/thermos/common:planner'),

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 36dada4..448baad 100644
--- a/src/main/python/apache/thermos/monitoring/BUILD
+++ b/src/main/python/apache/thermos/monitoring/BUILD
@@ -29,9 +29,9 @@ python_library(
   sources = ['garbage.py'],
   dependencies = [
     pants(':detector'),
-    pants('aurora/twitterdeps/src/python/twitter/common/dirutil'),
-    pants('aurora/twitterdeps/src/python/twitter/common/lang'),
-    pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
+    pants('3rdparty/python:twitter.common.dirutil'),
+    pants('3rdparty/python:twitter.common.lang'),
+    pants('3rdparty/python:twitter.common.quantity'),
     pants('src/main/python/apache/thermos/common:ckpt'),
     pants('src/main/python/apache/thermos/common:path'),
   ]
@@ -41,8 +41,8 @@ python_library(
   name = 'monitor',
   sources = ['monitor.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/recordio:recordio-thrift'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.recordio'),
     pants('src/main/python/apache/thermos/common:ckpt'),
     pants('src/main/thrift/org/apache/thermos:py-thrift'),
   ]
@@ -52,12 +52,12 @@ python_library(
   name = 'disk',
   sources = ['disk.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/dirutil'),
-    pants('aurora/twitterdeps/src/python/twitter/common/exceptions'),
-    pants('aurora/twitterdeps/src/python/twitter/common/lang'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
-    python_requirement('watchdog'),
+    pants('3rdparty/python:watchdog'),
+    pants('3rdparty/python:twitter.common.dirutil'),
+    pants('3rdparty/python:twitter.common.exceptions'),
+    pants('3rdparty/python:twitter.common.lang'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.quantity'),
   ]
 )
 
@@ -71,8 +71,8 @@ python_library(
   sources = ['process_collector_psutil.py'],
   dependencies = [
     pants(':process'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('src/main/python/apache/thermos:psutil'),
+    pants('3rdparty/python:psutil'),
+    pants('3rdparty/python:twitter.common.log'),
   ]
 )
 
@@ -84,11 +84,11 @@ python_library(
     pants(':monitor'),
     pants(':process'),
     pants(':process_collector_psutil'),
-    pants('aurora/twitterdeps/src/python/twitter/common/collections'),
-    pants('aurora/twitterdeps/src/python/twitter/common/concurrent'),
-    pants('aurora/twitterdeps/src/python/twitter/common/lang'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
+    pants('3rdparty/python:twitter.common.collections'),
+    pants('3rdparty/python:twitter.common.concurrent'),
+    pants('3rdparty/python:twitter.common.lang'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.quantity'),
   ]
 )
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 4aead08..7916882 100644
--- a/src/main/python/apache/thermos/observer/BUILD
+++ b/src/main/python/apache/thermos/observer/BUILD
@@ -20,9 +20,9 @@ python_library(
   name = 'observed_task',
   sources = ['observed_task.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/lang'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('src/main/python/apache/thermos:pystachio'),
+    pants('3rdparty/python:pystachio'),
+    pants('3rdparty/python:twitter.common.lang'),
+    pants('3rdparty/python:twitter.common.log'),
     pants('src/main/python/apache/thermos/common:ckpt'),
     pants('src/main/python/apache/thermos/config'),
   ]
@@ -33,10 +33,10 @@ python_library(
   sources = ['task_observer.py'],
   dependencies = [
     pants(':observed_task'),
-    pants('aurora/twitterdeps/src/python/twitter/common/exceptions'),
-    pants('aurora/twitterdeps/src/python/twitter/common/lang'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
+    pants('3rdparty/python:twitter.common.exceptions'),
+    pants('3rdparty/python:twitter.common.lang'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.quantity'),
     pants('src/main/python/apache/thermos/common:path'),
     pants('src/main/python/apache/thermos/monitoring:detector'),
     pants('src/main/python/apache/thermos/monitoring:monitor'),

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/src/main/python/apache/thermos/observer/bin/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/observer/bin/BUILD b/src/main/python/apache/thermos/observer/bin/BUILD
index d40237f..bd43f07 100644
--- a/src/main/python/apache/thermos/observer/bin/BUILD
+++ b/src/main/python/apache/thermos/observer/bin/BUILD
@@ -19,10 +19,10 @@ python_binary(
   source = 'thermos_observer.py',
   entry_point = 'apache.thermos.observer.bin.thermos_observer:proxy_main',
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/app'),
-    pants('aurora/twitterdeps/src/python/twitter/common/exceptions'),
-    pants('aurora/twitterdeps/src/python/twitter/common/http'),
-    pants('src/main/python/apache/thermos:cherrypy'),
+    pants('3rdparty/python:cherrypy'),
+    pants('3rdparty/python:twitter.common.app'),
+    pants('3rdparty/python:twitter.common.exceptions'),
+    pants('3rdparty/python:twitter.common.http'),
     pants('src/main/python/apache/thermos/common:path'),
     pants('src/main/python/apache/thermos/observer/http:http_observer'),
     pants('src/main/python/apache/thermos/observer:task_observer'),

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/src/main/python/apache/thermos/observer/http/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/observer/http/BUILD b/src/main/python/apache/thermos/observer/http/BUILD
index 96156f5..789a8e5 100644
--- a/src/main/python/apache/thermos/observer/http/BUILD
+++ b/src/main/python/apache/thermos/observer/http/BUILD
@@ -18,7 +18,7 @@ python_library(
   name = 'json',
   sources = ['json.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/http'),
+    pants('3rdparty/python:twitter.common.http'),
   ]
 )
 
@@ -27,7 +27,7 @@ python_library(
   sources = ['static_assets.py'],
   resources = rglobs('assets/*'),
   dependencies = [
-    pants('src/main/python/apache/thermos:bottle'),
+    pants('3rdparty/python:bottle'),
   ]
 )
 
@@ -42,10 +42,10 @@ python_library(
   sources = ['file_browser.py'],
   dependencies = [
     pants(':templating'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/http'),
-    pants('src/main/python/apache/thermos:bottle'),
-    pants('src/main/python/apache/thermos:mako'),
+    pants('3rdparty/python:bottle'),
+    pants('3rdparty/python:mako'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.http'),
   ]
 )
 
@@ -57,7 +57,7 @@ python_library(
     pants(':json'),
     pants(':static_assets'),
     pants(':templating'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
-    pants('aurora/twitterdeps/src/python/twitter/common/http'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.http'),
   ]
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 16f3dbb..e982a18 100644
--- a/src/main/python/apache/thermos/testing/BUILD
+++ b/src/main/python/apache/thermos/testing/BUILD
@@ -18,13 +18,13 @@ python_library(
   name = 'runner',
   sources = ['runner.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
-    pants('aurora/twitterdeps/src/python/twitter/common/log'),
+    pants('3rdparty/python:thrift'),
+    pants('3rdparty/python:twitter.common.contextutil'),
+    pants('3rdparty/python:twitter.common.log'),
     pants('src/main/python/apache/thermos/common:ckpt'),
     pants('src/main/python/apache/thermos/common:path'),
     pants('src/main/python/apache/thermos/config'),
     pants('src/main/python/apache/thermos/core'),
-    pants('src/main/python/apache/thermos:thrift'),
     pants('src/main/thrift/org/apache/thermos:py-thrift'),
   ]
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 d3820ff..258b1eb 100644
--- a/src/test/python/apache/aurora/admin/BUILD
+++ b/src/test/python/apache/aurora/admin/BUILD
@@ -23,9 +23,9 @@ python_test_suite(name = 'all',
 python_tests(name = 'mesos_maintenance',
   sources = ['test_mesos_maintenance.py'],
   dependencies = [
+    pants('3rdparty/python:mock'),
     pants('src/main/python/apache/aurora/common:cluster'),
     pants('src/main/python/apache/aurora/admin:mesos_maintenance'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
   ],
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 a61b37a..e34f1a6 100644
--- a/src/test/python/apache/aurora/client/BUILD
+++ b/src/test/python/apache/aurora/client/BUILD
@@ -29,8 +29,8 @@ python_tests(
   name = 'binding_helper',
   sources = ['test_binding_helper.py'],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:pystachio'),
-    pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
+    pants('3rdparty/python:pystachio'),
+    pants('3rdparty/python:twitter.common.contextutil'),
     pants('src/main/python/apache/aurora/client:binding_helper'),
     pants('src/main/python/apache/aurora/config'),
   ],
@@ -39,7 +39,7 @@ python_tests(
 python_tests(name = 'config',
   sources = ['test_config.py'],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
+    pants('3rdparty/python:mox'),
     pants('src/main/python/apache/aurora/client:config'),
   ],
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 5665dad..9833535 100644
--- a/src/test/python/apache/aurora/client/api/BUILD
+++ b/src/test/python/apache/aurora/client/api/BUILD
@@ -30,8 +30,8 @@ python_tests(
   name = 'disambiguator',
   sources = ['test_disambiguator.py'],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
-    pants('aurora/twitterdeps/src/python/twitter/common/app'),
+    pants('3rdparty/python:mox'),
+    pants('3rdparty/python:twitter.common.app'),
     pants('src/main/python/apache/aurora/client/api:disambiguator'),
   ],
 )
@@ -39,7 +39,7 @@ python_tests(
 python_tests(name = 'job_monitor',
   sources = ['test_job_monitor.py'],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
+    pants('3rdparty/python:mox'),
     pants('src/main/python/apache/aurora/client/api:api'),
     pants('src/main/python/apache/aurora/client/api:job_monitor'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
@@ -50,7 +50,7 @@ python_tests(name = 'job_monitor',
 python_tests(name = 'restarter',
   sources = ['test_restarter.py'],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
+    pants('3rdparty/python:mox'),
     pants('src/main/python/apache/aurora/client/api:restarter'),
     pants('src/main/python/apache/aurora/common:aurora_job_key'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
@@ -61,7 +61,7 @@ python_tests(name = 'restarter',
 python_tests(name = 'scheduler_client',
   sources = ['test_scheduler_client.py'],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
+    pants('3rdparty/python:mox'),
     pants('src/main/python/apache/aurora/client/api:scheduler_client'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ]
@@ -70,7 +70,7 @@ python_tests(name = 'scheduler_client',
 python_tests(name = 'instance_watcher',
   sources = ['test_instance_watcher.py', 'test_health_check.py'],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
+    pants('3rdparty/python:mox'),
     pants('src/main/python/apache/aurora/client/api:instance_watcher'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ]
@@ -79,7 +79,7 @@ python_tests(name = 'instance_watcher',
 python_tests(name = 'quota_check',
   sources = ['test_quota_check.py'],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
+    pants('3rdparty/python:mock'),
     pants('src/main/python/apache/aurora/client/api:quota_check'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ]
@@ -88,7 +88,7 @@ python_tests(name = 'quota_check',
 python_tests(name = 'updater',
   sources = ['test_updater.py'],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
+    pants('3rdparty/python:mox'),
     pants('src/main/python/apache/aurora/client/api:updater'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
     pants('src/test/python/apache/aurora/client:fake_scheduler_proxy'),

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 e619d22..5ba08ad 100644
--- a/src/test/python/apache/aurora/client/cli/BUILD
+++ b/src/test/python/apache/aurora/client/cli/BUILD
@@ -23,7 +23,7 @@ python_library(
   name = 'util',
   sources = [ 'util.py' ],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
+    pants('3rdparty/python:mock'),
     pants('src/main/python/apache/aurora/client/cli'),
   ]
 )
@@ -41,8 +41,8 @@ python_tests(
   ],
   dependencies = [
     pants(':util'),
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
-    pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
+    pants('3rdparty/python:mock'),
+    pants('3rdparty/python:twitter.common.contextutil'),
     pants('src/main/python/apache/aurora/client/cli'),
     pants('src/test/python/apache/aurora/client/commands:util')
   ]

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/src/test/python/apache/aurora/client/commands/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/BUILD b/src/test/python/apache/aurora/client/commands/BUILD
index a275504..02c27aa 100644
--- a/src/test/python/apache/aurora/client/commands/BUILD
+++ b/src/test/python/apache/aurora/client/commands/BUILD
@@ -32,9 +32,9 @@ python_tests(
     'test_update.py'
   ],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
     pants(':util'),
-    pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
+    pants('3rdparty/python:mock'),
+    pants('3rdparty/python:twitter.common.contextutil'),
     pants('src/main/python/apache/aurora/client/commands:core'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ])
@@ -45,9 +45,9 @@ python_tests(
     'test_ssh.py',
   ],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
     pants(':util'),
-    pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
+    pants('3rdparty/python:mock'),
+    pants('3rdparty/python:twitter.common.contextutil'),
     pants('src/main/python/apache/aurora/client/commands:ssh'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ])
@@ -58,9 +58,9 @@ python_tests(
     'test_run.py',
   ],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
     pants(':util'),
-    pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
+    pants('3rdparty/python:mock'),
+    pants('3rdparty/python:twitter.common.contextutil'),
     pants('src/main/python/apache/aurora/client/commands:run'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ])
@@ -69,7 +69,7 @@ python_library(
   name='util',
   sources = [ 'util.py' ],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
+    pants('3rdparty/python:mock'),
     pants('src/main/python/apache/aurora/client/commands:core'),
     pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ]

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 0283838..3d6f796 100644
--- a/src/test/python/apache/aurora/client/hooks/BUILD
+++ b/src/test/python/apache/aurora/client/hooks/BUILD
@@ -24,10 +24,10 @@ python_test_suite(name = 'all',
 python_tests(name = 'hooked_api',
   sources = ['test_hooked_api.py'],
   dependencies = [
+    pants('3rdparty/python:mock'),
     pants('src/main/python/apache/aurora/common:cluster'),
     pants('src/main/python/apache/aurora/client:api'),
     pants('src/main/python/apache/aurora/client/hooks'),
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
   ]
 )
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 9c8931b..2d9ba67 100644
--- a/src/test/python/apache/aurora/common/BUILD
+++ b/src/test/python/apache/aurora/common/BUILD
@@ -44,8 +44,8 @@ python_tests(
   name = 'test_clusters',
   sources = ['test_clusters.py'],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:pyyaml'),
-    pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
+    pants('3rdparty/python:pyyaml'),
+    pants('3rdparty/python:twitter.common.contextutil'),
     pants('src/main/python/apache/aurora/common:clusters'),
   ]
 )
@@ -54,7 +54,7 @@ python_tests(
   name = 'test_cluster_option',
   sources = ['test_cluster_option.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/options'),
+    pants('3rdparty/python:twitter.common.options'),
     pants('src/main/python/apache/aurora/common:cluster'),
     pants('src/main/python/apache/aurora/common:cluster_option'),
     pants('src/main/python/apache/aurora/common:clusters'),
@@ -65,7 +65,7 @@ python_tests(
   name = 'test_http_signaler',
   sources = ['test_http_signaler.py'],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
+    pants('3rdparty/python:mox'),
     pants('src/main/python/apache/aurora/common:http_signaler'),
   ]
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 b0951e8..216046a 100644
--- a/src/test/python/apache/aurora/config/BUILD
+++ b/src/test/python/apache/aurora/config/BUILD
@@ -26,7 +26,7 @@ python_test_suite(name = 'all',
 python_tests(name = 'test_base',
   sources = ['test_base.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
+    pants('3rdparty/python:twitter.common.contextutil'),
     pants('src/main/python/apache/aurora/config'),
   ]
 )
@@ -34,7 +34,7 @@ python_tests(name = 'test_base',
 python_tests(name = 'test_loader',
   sources = ['test_loader.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
+    pants('3rdparty/python:twitter.common.contextutil'),
     pants('src/main/python/apache/aurora/config'),
   ],
   coverage = [


Mime
View raw message