aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfarr...@apache.org
Subject [1/2] AURORA-30: Clean up and coalesce 3rdparty python deps
Date Tue, 28 Jan 2014 02:28:14 GMT
Updated Branches:
  refs/heads/master c33d8378b -> 44170174f


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 38c11d5..3f2387f 100644
--- a/src/test/python/apache/aurora/executor/BUILD
+++ b/src/test/python/apache/aurora/executor/BUILD
@@ -30,11 +30,11 @@ python_test_suite(name = 'all',
 python_tests(name = 'gc_executor',
   sources = ['test_gc_executor.py'],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
-    pants('aurora/twitterdeps/src/python/twitter/common/app'),
-    pants('aurora/twitterdeps/src/python/twitter/common/concurrent'),
-    pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
-    pants('aurora/twitterdeps/src/python/twitter/common/testing'),
+    pants('3rdparty/python:mock'),
+    pants('3rdparty/python:twitter.common.app'),
+    pants('3rdparty/python:twitter.common.concurrent'),
+    pants('3rdparty/python:twitter.common.quantity'),
+    pants('3rdparty/python:twitter.common.testing'),
     pants('src/main/python/apache/thermos/common:path'),
     pants('src/main/python/apache/thermos/config'),
     pants('src/main/python/apache/thermos/core:runner'),
@@ -48,8 +48,8 @@ python_tests(name = 'gc_executor',
 python_tests(name = 'executor_detector',
   sources = [ 'test_executor_detector.py' ],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
-    pants('aurora/twitterdeps/src/python/twitter/common/dirutil'),
+    pants('3rdparty/python:twitter.common.contextutil'),
+    pants('3rdparty/python:twitter.common.dirutil'),
     pants('src/main/python/apache/aurora/executor:executor_detector')
   ]
 )
@@ -58,9 +58,9 @@ python_tests(name = 'thermos_executor',
   sources = ['test_thermos_executor.py'],
   timeout = Amount(5, Time.MINUTES),
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/app'),
-    pants('aurora/twitterdeps/src/python/twitter/common/exceptions'),
-    pants('aurora/twitterdeps/src/python/twitter/common/quantity'),
+    pants('3rdparty/python:twitter.common.app'),
+    pants('3rdparty/python:twitter.common.exceptions'),
+    pants('3rdparty/python:twitter.common.quantity'),
     pants('src/main/python/apache/thermos/common'),
     pants('src/main/python/apache/thermos/core'),
     pants('src/main/python/apache/thermos/monitoring:monitor'),
@@ -78,10 +78,10 @@ python_tests(name = 'thermos_executor',
 python_tests(name = 'thermos_task_runner',
   sources = ['test_thermos_task_runner.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
-    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.contextutil'),
+    pants('3rdparty/python:twitter.common.dirutil'),
+    pants('3rdparty/python:twitter.common.log'),
+    pants('3rdparty/python:twitter.common.quantity'),
     pants('src/main/python/apache/aurora/config:schema'),
     pants('src/main/python/apache/aurora/executor/common:sandbox'),
     pants('src/main/python/apache/aurora/executor/common:status_checker'),
@@ -92,7 +92,7 @@ python_tests(name = 'thermos_task_runner',
 python_tests(name = 'executor_vars',
   sources = ['test_executor_vars.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
+    pants('3rdparty/python:twitter.common.contextutil'),
     pants('src/main/python/apache/aurora/executor:executor_vars'),
   ]
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 2b3ee27..845c5cb 100644
--- a/src/test/python/apache/aurora/executor/common/BUILD
+++ b/src/test/python/apache/aurora/executor/common/BUILD
@@ -28,8 +28,8 @@ python_tests(
   name = 'directory_sandbox',
   sources = ['test_directory_sandbox.py'],
   dependencies = [
-    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/executor/common:sandbox'),
   ],
 )
@@ -38,8 +38,8 @@ python_tests(
   name = 'health_checker',
   sources = ['test_health_checker.py'],
   dependencies = [
-    pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
-    pants('aurora/twitterdeps/src/python/twitter/common/testing'),
+    pants('3rdparty/python:mox'),
+    pants('3rdparty/python:twitter.common.testing'),
     pants('src/main/python/apache/aurora/executor/common:health_checker'),
   ]
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 00eb3d2..7bbd826 100644
--- a/src/test/python/apache/thermos/common/BUILD
+++ b/src/test/python/apache/thermos/common/BUILD
@@ -41,7 +41,7 @@ python_tests(name = 'test_planner',
 python_tests(name = 'test_task_planner',
   sources = ['test_task_planner.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/testing'),
+    pants('3rdparty/python:twitter.common.testing'),
     pants('src/main/python/apache/thermos/common:planner'),
     pants('src/main/python/apache/thermos/config:schema'),
   ],

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 e7e1fd8..d9fa82c 100644
--- a/src/test/python/apache/thermos/config/BUILD
+++ b/src/test/python/apache/thermos/config/BUILD
@@ -23,7 +23,7 @@ python_test_suite(name = 'all',
 python_tests(name = 'test_schema',
   sources = ['test_schema.py'],
   dependencies = [
-    pants('aurora/twitterdeps/src/python/twitter/common/collections'),
+    pants('3rdparty/python:twitter.common.collections'),
     pants('src/main/python/apache/thermos/config:schema')
   ]
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/44170174/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 2a060f9..99a3ed3 100644
--- a/src/test/python/apache/thermos/core/BUILD
+++ b/src/test/python/apache/thermos/core/BUILD
@@ -92,8 +92,8 @@ python_tests(name = 'test_failure_limit',
 python_tests(name = 'test_helper',
   sources = ['test_helper.py'],
   dependencies = [
-    pants('src/main/python/apache/thermos/BUILD.thirdparty:mock'),
-    pants('src/main/python/apache/thermos/BUILD.thirdparty:psutil'),
+    pants('3rdparty/python:mock'),
+    pants('3rdparty/python:psutil'),
     pants('src/main/python/apache/thermos/core:helper'),
   ]
 )
@@ -101,17 +101,17 @@ python_tests(name = 'test_helper',
 python_tests(name = 'test_process',
   sources = ['test_process.py'],
   dependencies = [
-    pants('src/main/python/apache/thermos/BUILD.thirdparty:mock'),
+    pants('3rdparty/python:mock'),
+    pants('3rdparty/python:twitter.common.contextutil'),
     pants('src/main/python/apache/thermos/testing:runner'),
-    pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
   ],
 )
 
 python_tests(name = 'test_staged_kill',
   sources = ['test_staged_kill.py'],
   dependencies = [
+     pants('3rdparty/python:twitter.common.process'),
      pants('src/main/python/apache/thermos/testing:runner'),
-     pants('aurora/twitterdeps/src/python/twitter/common/process'),
      pants('src/main/python/apache/thermos/monitoring:monitor'),
   ]
 )


Mime
View raw message