aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wfar...@apache.org
Subject [1/9] Refactors java and python code to the Apache namespace.
Date Tue, 31 Dec 2013 21:28:02 GMT
Updated Branches:
  refs/heads/master bc1635df8 -> cfb13f659


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/test_ssh.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_ssh.py b/src/test/python/apache/aurora/client/commands/test_ssh.py
index af97b36..64dc896 100644
--- a/src/test/python/apache/aurora/client/commands/test_ssh.py
+++ b/src/test/python/apache/aurora/client/commands/test_ssh.py
@@ -1,9 +1,9 @@
 import contextlib
 
-from twitter.aurora.client.commands.ssh import ssh
-from twitter.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.client.commands.ssh import ssh
+from apache.aurora.client.commands.util import AuroraClientCommandTest
 
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
     AssignedTask,
     Identity,
     JobKey,
@@ -79,10 +79,10 @@ class TestSshCommand(AuroraClientCommandTest):
     mock_scheduler.getTasksStatus.return_value = self.create_status_response()
     sandbox_args = {'slave_root': '/slaveroot', 'slave_run_directory': 'slaverun'}
     with contextlib.nested(
-        patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
-        patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+        patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+        patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
         patch('twitter.common.app.get_options', return_value=mock_options),
-        patch('twitter.aurora.client.api.command_runner.DistributedCommandRunner.sandbox_args',
+        patch('apache.aurora.client.api.command_runner.DistributedCommandRunner.sandbox_args',
             return_value=sandbox_args),
         patch('subprocess.call', return_value=0)) as (
             mock_scheduler_proxy_class,

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/test_status.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_status.py b/src/test/python/apache/aurora/client/commands/test_status.py
index 89f602d..9241631 100644
--- a/src/test/python/apache/aurora/client/commands/test_status.py
+++ b/src/test/python/apache/aurora/client/commands/test_status.py
@@ -1,12 +1,12 @@
 import contextlib
 import unittest
 
-from twitter.aurora.common.cluster import Cluster
-from twitter.aurora.common.clusters import Clusters
-from twitter.aurora.client.commands.core import status
-from twitter.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
+from apache.aurora.client.commands.core import status
+from apache.aurora.client.commands.util import AuroraClientCommandTest
 
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
     AssignedTask,
     Identity,
     JobKey,
@@ -77,8 +77,8 @@ class TestListJobs(AuroraClientCommandTest):
     (mock_api, mock_scheduler) = self.create_mock_api()
     mock_scheduler.getTasksStatus.return_value = self.create_status_response()
     with contextlib.nested(
-        patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
-        patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+        patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+        patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
         patch('twitter.common.app.get_options', return_value=mock_options)) as (
             mock_scheduler_proxy_class,
             mock_clusters,
@@ -97,8 +97,8 @@ class TestListJobs(AuroraClientCommandTest):
     (mock_api, mock_scheduler) = self.create_mock_api()
     mock_scheduler.getTasksStatus.return_value = self.create_failed_status_response()
     with contextlib.nested(
-        patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
-        patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+        patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler),
+        patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
         patch('twitter.common.app.get_options', return_value=mock_options)) as (
             mock_scheduler_proxy_class,
             mock_clusters,

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/test_update.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/test_update.py b/src/test/python/apache/aurora/client/commands/test_update.py
index 9aa2ba7..ccc3ee9 100644
--- a/src/test/python/apache/aurora/client/commands/test_update.py
+++ b/src/test/python/apache/aurora/client/commands/test_update.py
@@ -2,17 +2,17 @@ import contextlib
 import functools
 import unittest
 
-from twitter.aurora.common.cluster import Cluster
-from twitter.aurora.common.clusters import Clusters
-from twitter.aurora.client.commands.core import update
-from twitter.aurora.client.commands.util import AuroraClientCommandTest
-from twitter.aurora.client.api.updater import Updater
-from twitter.aurora.client.api.health_check import InstanceWatcherHealthCheck, Retriable
-from twitter.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
-from twitter.aurora.config import AuroraConfig
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
+from apache.aurora.client.commands.core import update
+from apache.aurora.client.commands.util import AuroraClientCommandTest
+from apache.aurora.client.api.updater import Updater
+from apache.aurora.client.api.health_check import InstanceWatcherHealthCheck, Retriable
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
+from apache.aurora.config import AuroraConfig
 from twitter.common.contextutil import temporary_file
 
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
     AcquireLockResult,
     AddInstancesConfig,
     AssignedTask,
@@ -62,9 +62,9 @@ class TestUpdateCommand(AuroraClientCommandTest):
     mock_options = self.setup_mock_options()
     (mock_api, mock_scheduler) = self.create_mock_api()
     with contextlib.nested(
-        patch('twitter.aurora.client.commands.core.make_client', return_value=mock_api),
+        patch('apache.aurora.client.commands.core.make_client', return_value=mock_api),
         patch('twitter.common.app.get_options', return_value=mock_options),
-        patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS)
+        patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS)
     ) as (make_client,
           options,
           test_clusters):
@@ -86,9 +86,9 @@ class TestUpdateCommand(AuroraClientCommandTest):
     (mock_api, mock_scheduler) = self.create_mock_api()
     # Set up the context to capture the make_client and get_options calls.
     with contextlib.nested(
-        patch('twitter.aurora.client.commands.core.make_client', return_value=mock_api),
+        patch('apache.aurora.client.commands.core.make_client', return_value=mock_api),
         patch('twitter.common.app.get_options', return_value=mock_options),
-        patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS)
+        patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS)
     ) as (make_client,
           options,
           test_clusters):
@@ -196,9 +196,9 @@ class TestUpdateCommand(AuroraClientCommandTest):
 
     with contextlib.nested(
         patch('twitter.common.app.get_options', return_value=mock_options),
-        patch('twitter.aurora.client.api.SchedulerProxy', return_value=mock_scheduler.scheduler),
-        patch('twitter.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
-        patch('twitter.aurora.client.api.instance_watcher.InstanceWatcherHealthCheck',
+        patch('apache.aurora.client.api.SchedulerProxy', return_value=mock_scheduler.scheduler),
+        patch('apache.aurora.client.factory.CLUSTERS', new=self.TEST_CLUSTERS),
+        patch('apache.aurora.client.api.instance_watcher.InstanceWatcherHealthCheck',
             return_value=mock_health_check),
         patch('time.time', side_effect=functools.partial(self.fake_time, self)),
         patch('time.sleep', return_value=None)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/commands/util.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/commands/util.py b/src/test/python/apache/aurora/client/commands/util.py
index fd06f0a..22694a2 100644
--- a/src/test/python/apache/aurora/client/commands/util.py
+++ b/src/test/python/apache/aurora/client/commands/util.py
@@ -1,10 +1,10 @@
 import unittest
 
-from twitter.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
-from twitter.aurora.common.cluster import Cluster
-from twitter.aurora.common.clusters import Clusters
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
 
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
     Response,
     ResponseCode,
     Result,

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/fake_scheduler_proxy.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/fake_scheduler_proxy.py b/src/test/python/apache/aurora/client/fake_scheduler_proxy.py
index 80c99f4..7565814 100644
--- a/src/test/python/apache/aurora/client/fake_scheduler_proxy.py
+++ b/src/test/python/apache/aurora/client/fake_scheduler_proxy.py
@@ -1,4 +1,4 @@
-from twitter.aurora.client.api.scheduler_client import SchedulerProxy
+from apache.aurora.client.api.scheduler_client import SchedulerProxy
 
 
 class FakeSchedulerProxy(SchedulerProxy):

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/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 71a69e1..67c6e41 100644
--- a/src/test/python/apache/aurora/client/hooks/BUILD
+++ b/src/test/python/apache/aurora/client/hooks/BUILD
@@ -8,17 +8,17 @@ python_test_suite(name = 'all',
 python_tests(name = 'hooked_api',
   sources = ['test_hooked_api.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/common:cluster'),
-    pants('src/main/python/twitter/aurora/client:api'),
-    pants('src/main/python/twitter/aurora/client/hooks'),
-    pants('src/main/python/twitter/aurora/BUILD.thirdparty: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'),
   ]
 )
 
 python_tests(name = 'non_hooked_api',
   sources = ['test_non_hooked_api.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/common:aurora_job_key'),
-    pants('src/main/python/twitter/aurora/client/hooks'),
+    pants('src/main/python/apache/aurora/common:aurora_job_key'),
+    pants('src/main/python/apache/aurora/client/hooks'),
   ],
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/hooks/test_hooked_api.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/hooks/test_hooked_api.py b/src/test/python/apache/aurora/client/hooks/test_hooked_api.py
index a3cc616..2226613 100644
--- a/src/test/python/apache/aurora/client/hooks/test_hooked_api.py
+++ b/src/test/python/apache/aurora/client/hooks/test_hooked_api.py
@@ -1,8 +1,8 @@
 from inspect import getargspec
 
-from twitter.aurora.client.hooks.hooked_api import HookedAuroraClientAPI, NonHookedAuroraClientAPI
-from twitter.aurora.client.api import AuroraClientAPI
-from twitter.aurora.common.cluster import Cluster
+from apache.aurora.client.hooks.hooked_api import HookedAuroraClientAPI, NonHookedAuroraClientAPI
+from apache.aurora.client.api import AuroraClientAPI
+from apache.aurora.common.cluster import Cluster
 
 from mock import Mock
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/hooks/test_non_hooked_api.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/hooks/test_non_hooked_api.py b/src/test/python/apache/aurora/client/hooks/test_non_hooked_api.py
index 6ff1e82..1cb1fd4 100644
--- a/src/test/python/apache/aurora/client/hooks/test_non_hooked_api.py
+++ b/src/test/python/apache/aurora/client/hooks/test_non_hooked_api.py
@@ -1,8 +1,8 @@
 import functools
 import unittest
 
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
-from twitter.aurora.client.hooks.hooked_api import NonHookedAuroraClientAPI
+from apache.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.client.hooks.hooked_api import NonHookedAuroraClientAPI
 
 
 API_METHODS = ('cancel_update', 'create_job', 'kill_job', 'restart', 'start_cronjob', 'update_job')

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/test_binding_helper.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/test_binding_helper.py b/src/test/python/apache/aurora/client/test_binding_helper.py
index 7ef951b..9bbda4c 100644
--- a/src/test/python/apache/aurora/client/test_binding_helper.py
+++ b/src/test/python/apache/aurora/client/test_binding_helper.py
@@ -1,8 +1,8 @@
 import textwrap
 
-from twitter.aurora.client import binding_helper
-from twitter.aurora.client.binding_helper import BindingHelper, CachingBindingHelper
-from twitter.aurora.config import AuroraConfig
+from apache.aurora.client import binding_helper
+from apache.aurora.client.binding_helper import BindingHelper, CachingBindingHelper
+from apache.aurora.config import AuroraConfig
 from twitter.common.contextutil import temporary_file
 
 from pystachio import Ref

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/client/test_config.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/test_config.py b/src/test/python/apache/aurora/client/test_config.py
index 70f30a5..ae7d9b7 100644
--- a/src/test/python/apache/aurora/client/test_config.py
+++ b/src/test/python/apache/aurora/client/test_config.py
@@ -2,12 +2,12 @@ import os
 
 from twitter.common.contextutil import temporary_dir, temporary_file
 
-from twitter.aurora.client import config
-from twitter.aurora.config import AuroraConfig
-from twitter.aurora.config.loader import AuroraConfigLoader
-from twitter.aurora.config.schema.base import Announcer, Job, MB, Resources, Task
+from apache.aurora.client import config
+from apache.aurora.config import AuroraConfig
+from apache.aurora.config.loader import AuroraConfigLoader
+from apache.aurora.config.schema.base import Announcer, Job, MB, Resources, Task
 
-from gen.twitter.aurora.constants import DEFAULT_ENVIRONMENT
+from gen.apache.aurora.constants import DEFAULT_ENVIRONMENT
 
 import pytest
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/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 326aeba..9eeae2d 100644
--- a/src/test/python/apache/aurora/common/BUILD
+++ b/src/test/python/apache/aurora/common/BUILD
@@ -12,7 +12,7 @@ python_test_suite(
 python_tests(name = 'test_aurora_job_key',
   sources = ['test_aurora_job_key.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/common:aurora_job_key')
+    pants('src/main/python/apache/aurora/common:aurora_job_key')
   ],
 )
 
@@ -20,7 +20,7 @@ python_tests(
   name = 'test_cluster',
   sources = ['test_cluster.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/common:cluster'),
+    pants('src/main/python/apache/aurora/common:cluster'),
   ]
 )
 
@@ -28,9 +28,9 @@ python_tests(
   name = 'test_clusters',
   sources = ['test_clusters.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/BUILD.thirdparty:pyyaml'),
+    pants('src/main/python/apache/aurora/BUILD.thirdparty:pyyaml'),
     pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
-    pants('src/main/python/twitter/aurora/common:clusters'),
+    pants('src/main/python/apache/aurora/common:clusters'),
   ]
 )
 
@@ -39,9 +39,9 @@ python_tests(
   sources = ['test_cluster_option.py'],
   dependencies = [
     pants('aurora/twitterdeps/src/python/twitter/common/options'),
-    pants('src/main/python/twitter/aurora/common:cluster'),
-    pants('src/main/python/twitter/aurora/common:cluster_option'),
-    pants('src/main/python/twitter/aurora/common:clusters'),
+    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'),
   ]
 )
 
@@ -49,7 +49,7 @@ python_tests(
   name = 'test_http_signaler',
   sources = ['test_http_signaler.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/BUILD.thirdparty:mox'),
-    pants('src/main/python/twitter/aurora/common:http_signaler'),
+    pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
+    pants('src/main/python/apache/aurora/common:http_signaler'),
   ]
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/common/test_aurora_job_key.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/common/test_aurora_job_key.py b/src/test/python/apache/aurora/common/test_aurora_job_key.py
index 94d46e8..8cf746e 100644
--- a/src/test/python/apache/aurora/common/test_aurora_job_key.py
+++ b/src/test/python/apache/aurora/common/test_aurora_job_key.py
@@ -1,6 +1,6 @@
 import unittest
 
-from twitter.aurora.common.aurora_job_key import AuroraJobKey
+from apache.aurora.common.aurora_job_key import AuroraJobKey
 
 # TODO(ksweeney): Moar coverage
 class AuroraJobKeyTest(unittest.TestCase):

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/common/test_cluster.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/common/test_cluster.py b/src/test/python/apache/aurora/common/test_cluster.py
index 14cf6b1..39f1fa4 100644
--- a/src/test/python/apache/aurora/common/test_cluster.py
+++ b/src/test/python/apache/aurora/common/test_cluster.py
@@ -1,4 +1,4 @@
-from twitter.aurora.common.cluster import Cluster
+from apache.aurora.common.cluster import Cluster
 
 from pystachio import (
     Default,

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/common/test_cluster_option.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/common/test_cluster_option.py b/src/test/python/apache/aurora/common/test_cluster_option.py
index 65860be..2d47b95 100644
--- a/src/test/python/apache/aurora/common/test_cluster_option.py
+++ b/src/test/python/apache/aurora/common/test_cluster_option.py
@@ -2,9 +2,9 @@ import pytest
 
 from twitter.common import options
 
-from twitter.aurora.common.cluster import Cluster
-from twitter.aurora.common.clusters import Clusters
-from twitter.aurora.common.cluster_option import ClusterOption
+from apache.aurora.common.cluster import Cluster
+from apache.aurora.common.clusters import Clusters
+from apache.aurora.common.cluster_option import ClusterOption
 
 
 CLUSTER_LIST = Clusters((

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/common/test_clusters.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/common/test_clusters.py b/src/test/python/apache/aurora/common/test_clusters.py
index bf3e6bd..f5a3526 100644
--- a/src/test/python/apache/aurora/common/test_clusters.py
+++ b/src/test/python/apache/aurora/common/test_clusters.py
@@ -1,7 +1,7 @@
 import json
 import os
 
-from twitter.aurora.common.clusters import Clusters, Parser
+from apache.aurora.common.clusters import Clusters, Parser
 from twitter.common.contextutil import temporary_dir
 
 import pytest

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/common/test_http_signaler.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/common/test_http_signaler.py b/src/test/python/apache/aurora/common/test_http_signaler.py
index 4970e1b..29a28b5 100644
--- a/src/test/python/apache/aurora/common/test_http_signaler.py
+++ b/src/test/python/apache/aurora/common/test_http_signaler.py
@@ -3,7 +3,7 @@ import unittest
 
 from twitter.common.lang import Compatibility
 
-from twitter.aurora.common.http_signaler import HttpSignaler
+from apache.aurora.common.http_signaler import HttpSignaler
 
 import mox
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/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 7a55538..3b59521 100644
--- a/src/test/python/apache/aurora/config/BUILD
+++ b/src/test/python/apache/aurora/config/BUILD
@@ -11,7 +11,7 @@ python_tests(name = 'test_base',
   sources = ['test_base.py'],
   dependencies = [
     pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
-    pants('src/main/python/twitter/aurora/config'),
+    pants('src/main/python/apache/aurora/config'),
   ]
 )
 
@@ -19,25 +19,25 @@ python_tests(name = 'test_loader',
   sources = ['test_loader.py'],
   dependencies = [
     pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
-    pants('src/main/python/twitter/aurora/config'),
+    pants('src/main/python/apache/aurora/config'),
   ],
   coverage = [
-    'twitter.aurora.config',
-    'twitter.thermos.config'
+    'apache.aurora.config',
+    'apache.thermos.config'
   ]
 )
 
 python_tests(name = 'test_constraint_parsing',
   sources = ['test_constraint_parsing.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/config'),
+    pants('src/main/python/apache/aurora/config'),
   ]
 )
 
 python_tests(name = 'test_thrift',
   sources = ['test_thrift.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/config'),
-    pants('src/main/thrift/com/twitter/aurora/gen:py-thrift-test'),
+    pants('src/main/python/apache/aurora/config'),
+    pants('src/main/thrift/org/apache/aurora/gen:py-thrift-test'),
   ]
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/config/test_base.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/config/test_base.py b/src/test/python/apache/aurora/config/test_base.py
index 27bb794..d8ffdc6 100644
--- a/src/test/python/apache/aurora/config/test_base.py
+++ b/src/test/python/apache/aurora/config/test_base.py
@@ -2,8 +2,8 @@ import pytest
 
 from twitter.common.contextutil import temporary_file
 
-from twitter.aurora.config import AuroraConfig, PortResolver
-from twitter.aurora.config.schema.base import (
+from apache.aurora.config import AuroraConfig, PortResolver
+from apache.aurora.config.schema.base import (
     Announcer,
     Empty,
     Integer,
@@ -13,7 +13,7 @@ from twitter.aurora.config.schema.base import (
     Task,
 )
 
-from gen.twitter.aurora.ttypes import Identity
+from gen.apache.aurora.ttypes import Identity
 
 
 resolve = PortResolver.resolve

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/config/test_constraint_parsing.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/config/test_constraint_parsing.py b/src/test/python/apache/aurora/config/test_constraint_parsing.py
index ac105c3..e1e7763 100644
--- a/src/test/python/apache/aurora/config/test_constraint_parsing.py
+++ b/src/test/python/apache/aurora/config/test_constraint_parsing.py
@@ -1,7 +1,7 @@
 import pytest
 import unittest
 
-from twitter.aurora.config.thrift import constraints_to_thrift
+from apache.aurora.config.thrift import constraints_to_thrift
 
 
 def test_parsing_constraints():

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/config/test_loader.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/config/test_loader.py b/src/test/python/apache/aurora/config/test_loader.py
index b92981a..7c05c87 100644
--- a/src/test/python/apache/aurora/config/test_loader.py
+++ b/src/test/python/apache/aurora/config/test_loader.py
@@ -3,9 +3,9 @@ import tempfile
 
 from twitter.common.contextutil import temporary_file
 
-from twitter.aurora.config import AuroraConfig
-from twitter.aurora.config.loader import AuroraConfigLoader
-from twitter.thermos.config.loader import ThermosTaskWrapper
+from apache.aurora.config import AuroraConfig
+from apache.aurora.config.loader import AuroraConfigLoader
+from apache.thermos.config.loader import ThermosTaskWrapper
 
 from pystachio import Environment
 import pytest

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/config/test_thrift.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/config/test_thrift.py b/src/test/python/apache/aurora/config/test_thrift.py
index f7f6b4f..494ed81 100644
--- a/src/test/python/apache/aurora/config/test_thrift.py
+++ b/src/test/python/apache/aurora/config/test_thrift.py
@@ -1,25 +1,25 @@
 import getpass
 import re
 
-from twitter.aurora.config import AuroraConfig
-from twitter.aurora.config.schema.base import Job, SimpleTask
-from twitter.aurora.config.thrift import (
+from apache.aurora.config import AuroraConfig
+from apache.aurora.config.schema.base import Job, SimpleTask
+from apache.aurora.config.thrift import (
     convert as convert_pystachio_to_thrift,
     InvalidConfig,
     task_instance_from_job,
 )
-from twitter.thermos.config.schema import (
+from apache.thermos.config.schema import (
     Process,
     Resources,
     Task,
 )
 
-from gen.twitter.aurora.constants import GOOD_IDENTIFIER_PATTERN_PYTHON
-from gen.twitter.aurora.test.constants import (
+from gen.apache.aurora.constants import GOOD_IDENTIFIER_PATTERN_PYTHON
+from gen.apache.aurora.test.constants import (
     INVALID_IDENTIFIERS,
     VALID_IDENTIFIERS,
 )
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
     CronCollisionPolicy,
     JobKey,
     Identity,

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/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 9316b64..b9d1318 100644
--- a/src/test/python/apache/aurora/executor/BUILD
+++ b/src/test/python/apache/aurora/executor/BUILD
@@ -7,24 +7,24 @@ python_test_suite(name = 'all',
     # pants(':gc_executor'),
     # pants(':thermos_executor'),
     pants(':thermos_task_runner'),
-    pants('src/test/python/twitter/aurora/executor/common:all'),
+    pants('src/test/python/apache/aurora/executor/common:all'),
   ]
 )
 
 python_tests(name = 'gc_executor',
   sources = ['test_gc_executor.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/BUILD.thirdparty:mock'),
+    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('src/main/python/twitter/thermos/common:path'),
-    pants('src/main/python/twitter/thermos/config'),
-    pants('src/main/python/twitter/thermos/core:runner'),
-    pants('src/main/thrift/com/twitter/thermos:py-thrift'),
-    pants('src/main/python/twitter/aurora/executor:gc_executor'),
-    pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+    pants('src/main/python/apache/thermos/common:path'),
+    pants('src/main/python/apache/thermos/config'),
+    pants('src/main/python/apache/thermos/core:runner'),
+    pants('src/main/thrift/org/apache/thermos:py-thrift'),
+    pants('src/main/python/apache/aurora/executor:gc_executor'),
+    pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ],
   coverage = 'twitter.mesos.executor.gc_executor'
 )
@@ -34,7 +34,7 @@ python_tests(name = 'executor_detector',
   dependencies = [
     pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
     pants('aurora/twitterdeps/src/python/twitter/common/dirutil'),
-    pants('src/main/python/twitter/aurora/executor:executor_detector')
+    pants('src/main/python/apache/aurora/executor:executor_detector')
   ]
 )
 
@@ -45,17 +45,17 @@ python_tests(name = 'thermos_executor',
     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('src/main/python/twitter/thermos/common'),
-    pants('src/main/python/twitter/thermos/core'),
-    pants('src/main/python/twitter/thermos/monitoring:monitor'),
-    pants('src/main/python/twitter/aurora/config:schema'),
-    pants('src/main/python/twitter/aurora/executor/common:executor_timeout'),
-    pants('src/main/python/twitter/aurora/executor/common:health_checker'),
-    pants('src/main/python/twitter/aurora/executor/common:sandbox'),
-    pants('src/main/python/twitter/aurora/executor/common:task_runner'),
-    pants('src/main/python/twitter/aurora/executor:thermos_executor'),
-    pants('src/main/python/twitter/aurora/executor:thermos_task_runner'),
-    pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+    pants('src/main/python/apache/thermos/common'),
+    pants('src/main/python/apache/thermos/core'),
+    pants('src/main/python/apache/thermos/monitoring:monitor'),
+    pants('src/main/python/apache/aurora/config:schema'),
+    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'),
+    pants('src/main/python/apache/aurora/executor/common:task_runner'),
+    pants('src/main/python/apache/aurora/executor:thermos_executor'),
+    pants('src/main/python/apache/aurora/executor:thermos_task_runner'),
+    pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
   ]
 )
 
@@ -66,10 +66,10 @@ python_tests(name = 'thermos_task_runner',
     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('src/main/python/twitter/aurora/config:schema'),
-    pants('src/main/python/twitter/aurora/executor/common:sandbox'),
-    pants('src/main/python/twitter/aurora/executor/common:status_checker'),
-    pants('src/main/python/twitter/aurora/executor:thermos_task_runner'),
+    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'),
+    pants('src/main/python/apache/aurora/executor:thermos_task_runner'),
   ]
 )
 
@@ -77,7 +77,7 @@ python_tests(name = 'executor_vars',
   sources = ['test_executor_vars.py'],
   dependencies = [
     pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
-    pants('src/main/python/twitter/aurora/executor:executor_vars'),
+    pants('src/main/python/apache/aurora/executor:executor_vars'),
   ]
 )
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/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 88db9a6..bece036 100644
--- a/src/test/python/apache/aurora/executor/common/BUILD
+++ b/src/test/python/apache/aurora/executor/common/BUILD
@@ -12,9 +12,9 @@ python_tests(
   name = 'directory_sandbox',
   sources = ['test_directory_sandbox.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/BUILD.thirdparty:mock'),
+    pants('src/main/python/apache/aurora/BUILD.thirdparty:mock'),
     pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
-    pants('src/main/python/twitter/aurora/executor/common:sandbox'),
+    pants('src/main/python/apache/aurora/executor/common:sandbox'),
   ],
 )
 
@@ -22,9 +22,9 @@ python_tests(
   name = 'health_checker',
   sources = ['test_health_checker.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/BUILD.thirdparty:mox'),
+    pants('src/main/python/apache/aurora/BUILD.thirdparty:mox'),
     pants('aurora/twitterdeps/src/python/twitter/common/testing'),
-    pants('src/main/python/twitter/aurora/executor/common:health_checker'),
+    pants('src/main/python/apache/aurora/executor/common:health_checker'),
   ]
 )
 
@@ -32,7 +32,7 @@ python_tests(
   name = 'status_checker',
   sources = ['test_status_checker.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/executor/common:status_checker'),
+    pants('src/main/python/apache/aurora/executor/common:status_checker'),
   ]
 )
 
@@ -40,8 +40,8 @@ python_tests(
   name = 'task_info',
   sources = ['test_task_info.py'],
   dependencies = [
-    pants('src/main/python/twitter/aurora/executor/common:task_info'),
-    pants('src/main/python/twitter/aurora/config/schema'),
-    pants('src/main/thrift/com/twitter/aurora/gen:py-thrift'),
+    pants('src/main/python/apache/aurora/executor/common:task_info'),
+    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/cfb13f65/src/test/python/apache/aurora/executor/common/test_directory_sandbox.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/common/test_directory_sandbox.py b/src/test/python/apache/aurora/executor/common/test_directory_sandbox.py
index c7b75de..513e722 100644
--- a/src/test/python/apache/aurora/executor/common/test_directory_sandbox.py
+++ b/src/test/python/apache/aurora/executor/common/test_directory_sandbox.py
@@ -1,6 +1,6 @@
 import os
 
-from twitter.aurora.executor.common.sandbox import DirectorySandbox
+from apache.aurora.executor.common.sandbox import DirectorySandbox
 from twitter.common.contextutil import temporary_dir
 
 import mock

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/executor/common/test_health_checker.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/common/test_health_checker.py b/src/test/python/apache/aurora/executor/common/test_health_checker.py
index a784958..23457c8 100644
--- a/src/test/python/apache/aurora/executor/common/test_health_checker.py
+++ b/src/test/python/apache/aurora/executor/common/test_health_checker.py
@@ -3,7 +3,7 @@ import unittest
 
 from twitter.common.testing.clock import ThreadedClock
 
-from twitter.aurora.executor.common.health_checker import HealthCheckerThread
+from apache.aurora.executor.common.health_checker import HealthCheckerThread
 
 import mox
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/executor/common/test_status_checker.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/common/test_status_checker.py b/src/test/python/apache/aurora/executor/common/test_status_checker.py
index 7d269f7..d463139 100644
--- a/src/test/python/apache/aurora/executor/common/test_status_checker.py
+++ b/src/test/python/apache/aurora/executor/common/test_status_checker.py
@@ -1,6 +1,6 @@
 import threading
 
-from twitter.aurora.executor.common.status_checker import (
+from apache.aurora.executor.common.status_checker import (
     ChainedStatusChecker,
     ExitState,
     Healthy,

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/executor/common/test_task_info.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/common/test_task_info.py b/src/test/python/apache/aurora/executor/common/test_task_info.py
index 76fae05..1523ee7 100644
--- a/src/test/python/apache/aurora/executor/common/test_task_info.py
+++ b/src/test/python/apache/aurora/executor/common/test_task_info.py
@@ -1,6 +1,6 @@
 import getpass
 
-from twitter.aurora.config.schema.base import (
+from apache.aurora.config.schema.base import (
     MB,
     MesosJob,
     MesosTaskInstance,
@@ -8,9 +8,9 @@ from twitter.aurora.config.schema.base import (
     Resources,
     Task,
 )
-from twitter.aurora.executor.common.task_info import mesos_task_instance_from_assigned_task
+from apache.aurora.executor.common.task_info import mesos_task_instance_from_assigned_task
 
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.ttypes import (
   AssignedTask,
   ExecutorConfig,
   TaskConfig,

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/executor/test_executor_builds.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/test_executor_builds.py b/src/test/python/apache/aurora/executor/test_executor_builds.py
index cd119f4..a5db8af 100644
--- a/src/test/python/apache/aurora/executor/test_executor_builds.py
+++ b/src/test/python/apache/aurora/executor/test_executor_builds.py
@@ -12,10 +12,10 @@ def build_and_execute_pex_target(target, binary):
 
 
 def test_thermos_executor_build():
-  build_and_execute_pex_target('src/main/python/twitter/aurora/executor/bin:thermos_executor',
+  build_and_execute_pex_target('src/main/python/apache/aurora/executor/bin:thermos_executor',
                                'dist/thermos_executor.pex')
 
 
 def test_gc_executor_build():
-  build_and_execute_pex_target('src/main/python/twitter/aurora/executor/bin:gc_executor',
+  build_and_execute_pex_target('src/main/python/apache/aurora/executor/bin:gc_executor',
                                'dist/gc_executor.pex')

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/executor/test_executor_detector.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/test_executor_detector.py b/src/test/python/apache/aurora/executor/test_executor_detector.py
index 0a3343b..81158e3 100644
--- a/src/test/python/apache/aurora/executor/test_executor_detector.py
+++ b/src/test/python/apache/aurora/executor/test_executor_detector.py
@@ -1,7 +1,7 @@
 import itertools
 import os
 
-from twitter.aurora.executor.executor_detector import ExecutorDetector
+from apache.aurora.executor.executor_detector import ExecutorDetector
 from twitter.common.contextutil import temporary_dir
 from twitter.common.dirutil import safe_mkdir
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/executor/test_executor_vars.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/test_executor_vars.py b/src/test/python/apache/aurora/executor/test_executor_vars.py
index 2414ab5..e81ffa8 100644
--- a/src/test/python/apache/aurora/executor/test_executor_vars.py
+++ b/src/test/python/apache/aurora/executor/test_executor_vars.py
@@ -1,6 +1,6 @@
 from twitter.common.contextutil import temporary_file, open_zip
 
-from twitter.aurora.executor.executor_vars import ExecutorVars
+from apache.aurora.executor.executor_vars import ExecutorVars
 
 
 def test_release_from_tag():

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/executor/test_gc_executor.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/test_gc_executor.py b/src/test/python/apache/aurora/executor/test_gc_executor.py
index 6539904..0a2fa35 100644
--- a/src/test/python/apache/aurora/executor/test_gc_executor.py
+++ b/src/test/python/apache/aurora/executor/test_gc_executor.py
@@ -8,20 +8,20 @@ import threading
 import time
 import unittest
 
-from twitter.aurora.executor.gc_executor import ThermosGCExecutor
+from apache.aurora.executor.gc_executor import ThermosGCExecutor
 from twitter.common.concurrent import deadline, Timeout
 from twitter.common.contextutil import temporary_dir
 from twitter.common.dirutil import safe_rmtree
 from twitter.common.quantity import Amount, Time
 from twitter.common.testing.clock import ThreadedClock
-from twitter.thermos.common.path import TaskPath
-from twitter.thermos.config.schema import SimpleTask
-from twitter.thermos.core.runner import TaskRunner
+from apache.thermos.common.path import TaskPath
+from apache.thermos.config.schema import SimpleTask
+from apache.thermos.core.runner import TaskRunner
 
-from gen.twitter.aurora.comm.ttypes import AdjustRetainedTasks, SchedulerMessage
-from gen.twitter.aurora.constants import LIVE_STATES, TERMINAL_STATES
-from gen.twitter.aurora.ttypes import ScheduleStatus
-from gen.twitter.thermos.ttypes import ProcessState, TaskState
+from gen.apache.aurora.comm.ttypes import AdjustRetainedTasks, SchedulerMessage
+from gen.apache.aurora.constants import LIVE_STATES, TERMINAL_STATES
+from gen.apache.aurora.ttypes import ScheduleStatus
+from gen.apache.thermos.ttypes import ProcessState, TaskState
 
 import mock
 from thrift.TSerialization import serialize as thrift_serialize
@@ -66,7 +66,7 @@ def setup_tree(td, lose=False):
   safe_rmtree(td)
   
   # TODO(wickman) These should be referred as resources= in the python_target instead.
-  shutil.copytree('src/resources/com/twitter/thermos/root', td)
+  shutil.copytree('src/resources/org/apache/thermos/root', td)
 
   if lose:
     lost_age = time.time() - (
@@ -544,7 +544,7 @@ def test_gc_lifetime():
     assert not executor._stop_event.is_set()
 
 
-DIRECTORY_SANDBOX = 'twitter.aurora.executor.gc_executor.DirectorySandbox'
+DIRECTORY_SANDBOX = 'apache.aurora.executor.gc_executor.DirectorySandbox'
 
 
 class TestRealGC(unittest.TestCase):

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/executor/test_thermos_executor.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/test_thermos_executor.py b/src/test/python/apache/aurora/executor/test_thermos_executor.py
index bd61545..2166c9a 100644
--- a/src/test/python/apache/aurora/executor/test_thermos_executor.py
+++ b/src/test/python/apache/aurora/executor/test_thermos_executor.py
@@ -8,7 +8,7 @@ import tempfile
 import threading
 import time
 
-from twitter.aurora.config.schema.base import (
+from apache.aurora.config.schema.base import (
     HealthCheckConfig,
     MB,
     MesosJob,
@@ -17,28 +17,28 @@ from twitter.aurora.config.schema.base import (
     Resources,
     Task,
 )
-from twitter.aurora.executor.common.executor_timeout import ExecutorTimeout
-from twitter.aurora.executor.common.health_checker import HealthCheckerProvider
-from twitter.aurora.executor.common.sandbox import DirectorySandbox, SandboxProvider
-from twitter.aurora.executor.common.task_runner import TaskError
-from twitter.aurora.executor.status_manager import StatusManager
-from twitter.aurora.executor.thermos_task_runner import (
+from apache.aurora.executor.common.executor_timeout import ExecutorTimeout
+from apache.aurora.executor.common.health_checker import HealthCheckerProvider
+from apache.aurora.executor.common.sandbox import DirectorySandbox, SandboxProvider
+from apache.aurora.executor.common.task_runner import TaskError
+from apache.aurora.executor.status_manager import StatusManager
+from apache.aurora.executor.thermos_task_runner import (
     DefaultThermosTaskRunnerProvider,
     ThermosTaskRunner,
 )
-from twitter.aurora.executor.thermos_executor import ThermosExecutor
+from apache.aurora.executor.thermos_executor import ThermosExecutor
 from twitter.common import log
 from twitter.common.contextutil import temporary_dir
 from twitter.common.dirutil import safe_mkdtemp, safe_rmtree
 from twitter.common.exceptions import ExceptionalThread
 from twitter.common.log.options import LogOptions
 from twitter.common.quantity import Amount, Time
-from twitter.thermos.common.path import TaskPath
-from twitter.thermos.core.runner import TaskRunner
-from twitter.thermos.monitoring.monitor import TaskMonitor
+from apache.thermos.common.path import TaskPath
+from apache.thermos.core.runner import TaskRunner
+from apache.thermos.monitoring.monitor import TaskMonitor
 
-from gen.twitter.aurora.constants import AURORA_EXECUTOR_NAME
-from gen.twitter.aurora.ttypes import (
+from gen.apache.aurora.constants import AURORA_EXECUTOR_NAME
+from gen.apache.aurora.ttypes import (
   AssignedTask,
   ExecutorConfig,
   Identity,
@@ -251,7 +251,7 @@ class TestThermosExecutor(object):
     log.init('executor_logger')
     if not cls.PANTS_BUILT and 'SKIP_PANTS_BUILD' not in os.environ:
       assert subprocess.call(["./pants",
-          "src/main/python/twitter/aurora/executor/bin:thermos_runner"]) == 0
+          "src/main/python/apache/aurora/executor/bin:thermos_runner"]) == 0
       cls.PANTS_BUILT = True
 
   @classmethod

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/aurora/executor/test_thermos_task_runner.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/executor/test_thermos_task_runner.py b/src/test/python/apache/aurora/executor/test_thermos_task_runner.py
index 42163d3..eb0eb7b 100644
--- a/src/test/python/apache/aurora/executor/test_thermos_task_runner.py
+++ b/src/test/python/apache/aurora/executor/test_thermos_task_runner.py
@@ -6,16 +6,16 @@ import sys
 import tempfile
 import time
 
-from twitter.aurora.config.schema.base import (
+from apache.aurora.config.schema.base import (
     MB,
     MesosTaskInstance,
     Process,
     Resources,
     Task,
 )
-from twitter.aurora.executor.common.sandbox import DirectorySandbox
-from twitter.aurora.executor.common.status_checker import ExitState
-from twitter.aurora.executor.thermos_task_runner import ThermosTaskRunner
+from apache.aurora.executor.common.sandbox import DirectorySandbox
+from apache.aurora.executor.common.status_checker import ExitState
+from apache.aurora.executor.thermos_task_runner import ThermosTaskRunner
 from twitter.common import log
 from twitter.common.log.options import LogOptions
 from twitter.common.dirutil import safe_rmtree
@@ -48,7 +48,7 @@ class TestThermosTaskRunnerIntegration(object):
     log.init('executor_logger')
     if not cls.PANTS_BUILT and 'SKIP_PANTS_BUILD' not in os.environ:
       assert subprocess.call(["./pants",
-          "src/main/python/twitter/aurora/executor/bin:thermos_runner"]) == 0
+          "src/main/python/apache/aurora/executor/bin:thermos_runner"]) == 0
       cls.PANTS_BUILT = True
 
   @classmethod

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/BUILD b/src/test/python/apache/thermos/BUILD
index 92f41da..38c2f4b 100644
--- a/src/test/python/apache/thermos/BUILD
+++ b/src/test/python/apache/thermos/BUILD
@@ -1,9 +1,9 @@
 python_test_suite(
   name = 'all',
   dependencies = [
-    pants('src/test/python/twitter/thermos/common:all'),
-    pants('src/test/python/twitter/thermos/config:all'),
-    pants('src/test/python/twitter/thermos/core:all'),
-    pants('src/test/python/twitter/thermos/monitoring:all'),
+    pants('src/test/python/apache/thermos/common:all'),
+    pants('src/test/python/apache/thermos/config:all'),
+    pants('src/test/python/apache/thermos/core:all'),
+    pants('src/test/python/apache/thermos/monitoring:all'),
   ]
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/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 832067f..04de70c 100644
--- a/src/test/python/apache/thermos/common/BUILD
+++ b/src/test/python/apache/thermos/common/BUILD
@@ -9,24 +9,24 @@ python_test_suite(name = 'all',
 python_tests(name = 'test_pathspec',
   sources = ['test_pathspec.py'],
   dependencies = [
-    pants('src/main/python/twitter/thermos/common:path'),
+    pants('src/main/python/apache/thermos/common:path'),
   ],
-  coverage = 'twitter.thermos.base.path'
+  coverage = 'apache.thermos.base.path'
 )
 
 python_tests(name = 'test_planner',
   sources = ['test_planner.py'],
   dependencies = [
-    pants('src/main/python/twitter/thermos/common:planner'),
+    pants('src/main/python/apache/thermos/common:planner'),
   ],
-  coverage = 'twitter.thermos.base.planner'
+  coverage = 'apache.thermos.base.planner'
 )
 
 python_tests(name = 'test_task_planner',
   sources = ['test_task_planner.py'],
   dependencies = [
     pants('aurora/twitterdeps/src/python/twitter/common/testing'),
-    pants('src/main/python/twitter/thermos/common:planner'),
-    pants('src/main/python/twitter/thermos/config:schema'),
+    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/cfb13f65/src/test/python/apache/thermos/common/test_pathspec.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/common/test_pathspec.py b/src/test/python/apache/thermos/common/test_pathspec.py
index 105d9e9..275004c 100644
--- a/src/test/python/apache/thermos/common/test_pathspec.py
+++ b/src/test/python/apache/thermos/common/test_pathspec.py
@@ -1,6 +1,6 @@
 import os
 
-from twitter.thermos.common.path import TaskPath
+from apache.thermos.common.path import TaskPath
 
 
 def test_legacy_task_roots():

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/common/test_planner.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/common/test_planner.py b/src/test/python/apache/thermos/common/test_planner.py
index 8fc7d46..879cf29 100644
--- a/src/test/python/apache/thermos/common/test_planner.py
+++ b/src/test/python/apache/thermos/common/test_planner.py
@@ -1,5 +1,5 @@
 import pytest
-from twitter.thermos.common.planner import Planner
+from apache.thermos.common.planner import Planner
 
 
 def details(planner):

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/common/test_task_planner.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/common/test_task_planner.py b/src/test/python/apache/thermos/common/test_task_planner.py
index 59bdc08..0c5b9fb 100644
--- a/src/test/python/apache/thermos/common/test_task_planner.py
+++ b/src/test/python/apache/thermos/common/test_task_planner.py
@@ -1,7 +1,7 @@
 import pytest
 from twitter.common.testing.clock import ThreadedClock
-from twitter.thermos.common.planner import TaskPlanner
-from twitter.thermos.config.schema import *
+from apache.thermos.common.planner import TaskPlanner
+from apache.thermos.config.schema import *
 
 
 p1 = Process(name = "p1", cmdline = "")

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/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 b80277c..5ff96ea 100644
--- a/src/test/python/apache/thermos/config/BUILD
+++ b/src/test/python/apache/thermos/config/BUILD
@@ -8,6 +8,6 @@ python_tests(name = 'test_schema',
   sources = ['test_schema.py'],
   dependencies = [
     pants('aurora/twitterdeps/src/python/twitter/common/collections'),
-    pants('src/main/python/twitter/thermos/config:schema')
+    pants('src/main/python/apache/thermos/config:schema')
   ]
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/config/test_schema.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/config/test_schema.py b/src/test/python/apache/thermos/config/test_schema.py
index c1ae00d..1d99f6e 100644
--- a/src/test/python/apache/thermos/config/test_schema.py
+++ b/src/test/python/apache/thermos/config/test_schema.py
@@ -1,7 +1,7 @@
 import pytest
 
 from twitter.common.collections import OrderedDict
-from twitter.thermos.config.schema import (
+from apache.thermos.config.schema import (
   Constraint,
   List,
   Process,

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/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 fd0487d..8cfbe83 100644
--- a/src/test/python/apache/thermos/core/BUILD
+++ b/src/test/python/apache/thermos/core/BUILD
@@ -33,14 +33,14 @@ python_test_suite(name = 'large',
 python_tests(name = 'test_runner_integration',
   sources = ['test_runner_integration.py'],
   dependencies = [
-    pants('src/main/python/twitter/thermos/testing:runner'),
+    pants('src/main/python/apache/thermos/testing:runner'),
   ],
 )
 
 python_tests(name = 'test_angry',
   sources = ['test_angry.py'],
   dependencies = [
-    pants('src/main/python/twitter/thermos/testing:runner'),
+    pants('src/main/python/apache/thermos/testing:runner'),
   ],
   timeout = Amount(5, Time.MINUTES)
 )
@@ -48,45 +48,45 @@ python_tests(name = 'test_angry',
 python_tests(name = 'test_ephemerals',
   sources = ['test_ephemerals.py'],
   dependencies = [
-    pants('src/main/python/twitter/thermos/testing:runner'),
+    pants('src/main/python/apache/thermos/testing:runner'),
   ],
 )
 
 python_tests(name = 'test_failing_runner',
   sources = ['test_failing_runner.py'],
   dependencies = [
-    pants('src/main/python/twitter/thermos/testing:runner'),
+    pants('src/main/python/apache/thermos/testing:runner'),
   ],
 )
 
 python_tests(name = 'test_finalization',
   sources = ['test_finalization.py'],
   dependencies = [
-    pants('src/main/python/twitter/thermos/testing:runner'),
+    pants('src/main/python/apache/thermos/testing:runner'),
   ],
 )
 
 python_tests(name = 'test_failure_limit',
   sources = ['test_failure_limit.py'],
   dependencies = [
-    pants('src/main/python/twitter/thermos/testing:runner'),
+    pants('src/main/python/apache/thermos/testing:runner'),
   ],
 )
 
 python_tests(name = 'test_helper',
   sources = ['test_helper.py'],
   dependencies = [
-    pants('src/main/python/twitter/thermos/BUILD.thirdparty:mock'),
-    pants('src/main/python/twitter/thermos/BUILD.thirdparty:psutil'),
-    pants('src/main/python/twitter/thermos/core:helper'),
+    pants('src/main/python/apache/thermos/BUILD.thirdparty:mock'),
+    pants('src/main/python/apache/thermos/BUILD.thirdparty:psutil'),
+    pants('src/main/python/apache/thermos/core:helper'),
   ]
 )
 
 python_tests(name = 'test_process',
   sources = ['test_process.py'],
   dependencies = [
-    pants('src/main/python/twitter/thermos/BUILD.thirdparty:mock'),
-    pants('src/main/python/twitter/thermos/testing:runner'),
+    pants('src/main/python/apache/thermos/BUILD.thirdparty:mock'),
+    pants('src/main/python/apache/thermos/testing:runner'),
     pants('aurora/twitterdeps/src/python/twitter/common/contextutil'),
   ],
 )
@@ -94,8 +94,8 @@ python_tests(name = 'test_process',
 python_tests(name = 'test_staged_kill',
   sources = ['test_staged_kill.py'],
   dependencies = [
-     pants('src/main/python/twitter/thermos/testing:runner'),
+     pants('src/main/python/apache/thermos/testing:runner'),
      pants('aurora/twitterdeps/src/python/twitter/common/process'),
-     pants('src/main/python/twitter/thermos/monitoring:monitor'),
+     pants('src/main/python/apache/thermos/monitoring:monitor'),
   ]
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/core/test_angry.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_angry.py b/src/test/python/apache/thermos/core/test_angry.py
index a91bafb..fbe457c 100644
--- a/src/test/python/apache/thermos/core/test_angry.py
+++ b/src/test/python/apache/thermos/core/test_angry.py
@@ -1,8 +1,8 @@
 import random
 
-from twitter.thermos.config.schema import Task, Process
-from twitter.thermos.testing.runner import Runner
-from gen.twitter.thermos.ttypes import TaskState, ProcessState
+from apache.thermos.config.schema import Task, Process
+from apache.thermos.testing.runner import Runner
+from gen.apache.thermos.ttypes import TaskState, ProcessState
 
 
 def flaky_task():

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/core/test_ephemerals.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_ephemerals.py b/src/test/python/apache/thermos/core/test_ephemerals.py
index ca8353b..f8339dc 100644
--- a/src/test/python/apache/thermos/core/test_ephemerals.py
+++ b/src/test/python/apache/thermos/core/test_ephemerals.py
@@ -1,9 +1,9 @@
-from twitter.thermos.config.schema import (
+from apache.thermos.config.schema import (
   Task,
   Resources,
   Process)
-from twitter.thermos.testing.runner import RunnerTestBase
-from gen.twitter.thermos.ttypes import (
+from apache.thermos.testing.runner import RunnerTestBase
+from gen.apache.thermos.ttypes import (
   TaskState,
   ProcessState
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/core/test_failing_runner.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_failing_runner.py b/src/test/python/apache/thermos/core/test_failing_runner.py
index 3a69daa..2d6f7b3 100644
--- a/src/test/python/apache/thermos/core/test_failing_runner.py
+++ b/src/test/python/apache/thermos/core/test_failing_runner.py
@@ -1,6 +1,6 @@
-from twitter.thermos.config.schema import Task, Resources, Process
-from twitter.thermos.testing.runner import RunnerTestBase
-from gen.twitter.thermos.ttypes import (
+from apache.thermos.config.schema import Task, Resources, Process
+from apache.thermos.testing.runner import RunnerTestBase
+from gen.apache.thermos.ttypes import (
   TaskState,
   ProcessState
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/core/test_failure_limit.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_failure_limit.py b/src/test/python/apache/thermos/core/test_failure_limit.py
index f983fe7..d79dd87 100644
--- a/src/test/python/apache/thermos/core/test_failure_limit.py
+++ b/src/test/python/apache/thermos/core/test_failure_limit.py
@@ -1,9 +1,9 @@
-from twitter.thermos.config.schema import (
+from apache.thermos.config.schema import (
   Task,
   Resources,
   Process)
-from twitter.thermos.testing.runner import RunnerTestBase
-from gen.twitter.thermos.ttypes import (
+from apache.thermos.testing.runner import RunnerTestBase
+from gen.apache.thermos.ttypes import (
   TaskState,
   ProcessState
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/core/test_finalization.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_finalization.py b/src/test/python/apache/thermos/core/test_finalization.py
index 9a863cf..56576d7 100644
--- a/src/test/python/apache/thermos/core/test_finalization.py
+++ b/src/test/python/apache/thermos/core/test_finalization.py
@@ -1,10 +1,10 @@
-from twitter.thermos.config.schema import (
+from apache.thermos.config.schema import (
   Constraint,
   Process,
   Task
 )
-from twitter.thermos.testing.runner import RunnerTestBase
-from gen.twitter.thermos.ttypes import ProcessState, TaskState
+from apache.thermos.testing.runner import RunnerTestBase
+from gen.apache.thermos.ttypes import ProcessState, TaskState
 
 
 class TestRegularFinalizingTask(RunnerTestBase):

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/core/test_helper.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_helper.py b/src/test/python/apache/thermos/core/test_helper.py
index bdea9d3..c8d0916 100644
--- a/src/test/python/apache/thermos/core/test_helper.py
+++ b/src/test/python/apache/thermos/core/test_helper.py
@@ -1,9 +1,9 @@
 import time
 
 from twitter.common.quantity import Time
-from twitter.thermos.core.helper import TaskRunnerHelper as TRH
+from apache.thermos.core.helper import TaskRunnerHelper as TRH
 
-from gen.twitter.thermos.ttypes import (
+from gen.apache.thermos.ttypes import (
     ProcessStatus,
     RunnerHeader,
     RunnerState,
@@ -44,7 +44,7 @@ def test_this_is_really_our_pid():
       process.create_time - (TRH.MAX_START_TIME_DRIFT.as_(Time.SECONDS) + 1))
 
 
-TRH_PATH = 'twitter.thermos.core.helper.TaskRunnerHelper'
+TRH_PATH = 'apache.thermos.core.helper.TaskRunnerHelper'
 PSUTIL_PATH = 'psutil.Process'
 
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/core/test_process.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_process.py b/src/test/python/apache/thermos/core/test_process.py
index 4216e9b..fcf26eb 100644
--- a/src/test/python/apache/thermos/core/test_process.py
+++ b/src/test/python/apache/thermos/core/test_process.py
@@ -9,10 +9,10 @@ from twitter.common.contextutil import temporary_dir
 from twitter.common.dirutil import safe_mkdir
 from twitter.common.recordio import ThriftRecordReader
 
-from twitter.thermos.common.path import TaskPath
-from twitter.thermos.core.process import Process
+from apache.thermos.common.path import TaskPath
+from apache.thermos.core.process import Process
 
-from gen.twitter.thermos.ttypes import RunnerCkpt
+from gen.apache.thermos.ttypes import RunnerCkpt
 
 import mock
 import pytest

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/core/test_runner_integration.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_runner_integration.py b/src/test/python/apache/thermos/core/test_runner_integration.py
index 67d9df3..f63cb84 100644
--- a/src/test/python/apache/thermos/core/test_runner_integration.py
+++ b/src/test/python/apache/thermos/core/test_runner_integration.py
@@ -1,7 +1,7 @@
 import os
 from textwrap import dedent
 
-from twitter.thermos.config.schema import (
+from apache.thermos.config.schema import (
   order,
   Process,
   Resources,
@@ -9,9 +9,9 @@ from twitter.thermos.config.schema import (
   Task,
   Tasks,
 )
-from twitter.thermos.testing.runner import RunnerTestBase
+from apache.thermos.testing.runner import RunnerTestBase
 
-from gen.twitter.thermos.ttypes import (
+from gen.apache.thermos.ttypes import (
   TaskState,
   ProcessState
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/core/test_staged_kill.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/core/test_staged_kill.py b/src/test/python/apache/thermos/core/test_staged_kill.py
index f0f1aa9..d2a207f 100644
--- a/src/test/python/apache/thermos/core/test_staged_kill.py
+++ b/src/test/python/apache/thermos/core/test_staged_kill.py
@@ -6,15 +6,15 @@ import time
 
 from twitter.common.process import ProcessProviderFactory
 from twitter.common.quantity import Amount, Time
-from twitter.thermos.config.schema import (
+from apache.thermos.config.schema import (
   Task,
   Resources,
   Process)
-from twitter.thermos.core.runner import TaskRunner
-from twitter.thermos.monitoring.monitor import TaskMonitor
-from twitter.thermos.testing.runner import Runner
+from apache.thermos.core.runner import TaskRunner
+from apache.thermos.monitoring.monitor import TaskMonitor
+from apache.thermos.testing.runner import Runner
 
-from gen.twitter.thermos.ttypes import (
+from gen.apache.thermos.ttypes import (
   TaskState,
   ProcessState
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/monitoring/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/monitoring/BUILD b/src/test/python/apache/thermos/monitoring/BUILD
index 7b3bd82..1654e37 100644
--- a/src/test/python/apache/thermos/monitoring/BUILD
+++ b/src/test/python/apache/thermos/monitoring/BUILD
@@ -7,7 +7,7 @@ python_test_suite(name = 'all',
 python_tests(name = 'test_disk',
   sources = ['test_disk.py'],
   dependencies = [
-    pants('src/main/python/twitter/thermos/monitoring:disk'),
+    pants('src/main/python/apache/thermos/monitoring:disk'),
   ]
 )
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/python/apache/thermos/monitoring/test_disk.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/monitoring/test_disk.py b/src/test/python/apache/thermos/monitoring/test_disk.py
index 8506ad3..8ce3ea0 100644
--- a/src/test/python/apache/thermos/monitoring/test_disk.py
+++ b/src/test/python/apache/thermos/monitoring/test_disk.py
@@ -6,8 +6,8 @@ import sys
 
 from twitter.common.quantity import Amount, Data, Time
 from twitter.common.dirutil import safe_mkdtemp
-from twitter.thermos.monitoring.disk import DiskCollector
-from twitter.thermos.monitoring.disk import InotifyDiskCollector
+from apache.thermos.monitoring.disk import DiskCollector
+from apache.thermos.monitoring.disk import InotifyDiskCollector
 
 import pytest
 


Mime
View raw message