aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zma...@apache.org
Subject incubator-aurora git commit: Pin protobuf dependency to 2.6.1
Date Tue, 17 Feb 2015 21:41:17 GMT
Repository: incubator-aurora
Updated Branches:
  refs/heads/master 2b8eb4bc3 -> ae8a3fe0c


Pin protobuf dependency to 2.6.1

Testing Done:
$ ./pants binary src/main/python/apache/aurora/executor/bin:thermos_executor &&
./pants binary src/main/python/apache/aurora/executor/bin:gc_executor
$ unzip gc_executor.pex -d gc_executor
$ unzip thermos_executor.pex -d thermos_executor
$ ls gc_executor/.deps/ | grep protobuf
protobuf-2.6.1-py2.7.egg
$ ls thermos_executor/.deps/ | grep protobuf
protobuf-2.6.1-py2.7.egg
$ ./pants test.pytest --no-fast src/test/python::

Bugs closed: AURORA-1128

Reviewed at https://reviews.apache.org/r/31135/


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

Branch: refs/heads/master
Commit: ae8a3fe0c5374bd4abce73bd79dcf53ef4194bb3
Parents: 2b8eb4b
Author: Zameer Manji <zmanji@apache.org>
Authored: Tue Feb 17 13:41:04 2015 -0800
Committer: Zameer Manji <zmanji@apache.org>
Committed: Tue Feb 17 13:41:04 2015 -0800

----------------------------------------------------------------------
 3rdparty/python/requirements.txt                    |  1 +
 src/main/python/apache/aurora/executor/BUILD        | 12 ++++++++++++
 src/main/python/apache/aurora/executor/bin/BUILD    |  6 ++++++
 src/main/python/apache/aurora/executor/common/BUILD |  9 +++++++++
 4 files changed, 28 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/ae8a3fe0/3rdparty/python/requirements.txt
----------------------------------------------------------------------
diff --git a/3rdparty/python/requirements.txt b/3rdparty/python/requirements.txt
index da600f4..9f7bea9 100644
--- a/3rdparty/python/requirements.txt
+++ b/3rdparty/python/requirements.txt
@@ -6,6 +6,7 @@ mesos.native==0.21.1
 mock==1.0.1
 mox==0.5.3
 pex==0.8.2
+protobuf==2.6.1
 psutil==2.1.3
 pystachio==0.7.4
 pyyaml==3.10

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/ae8a3fe0/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 edd83cf..cbb2f5f 100644
--- a/src/main/python/apache/aurora/executor/BUILD
+++ b/src/main/python/apache/aurora/executor/BUILD
@@ -19,6 +19,9 @@ python_library(
   sources = ['thermos_task_runner.py'],
   dependencies = [
     '3rdparty/python:mesos.interface',
+    # To prevent an alpha version of protobuf from being pulled down by pants we
+    # specify protobuf here. See AURORA-1128 for more details.
+    '3rdparty/python:protobuf',
     '3rdparty/python:twitter.common.dirutil',
     '3rdparty/python:twitter.common.log',
     '3rdparty/python:twitter.common.quantity',
@@ -63,6 +66,9 @@ python_library(
   sources = ['executor_base.py'],
   dependencies = [
     '3rdparty/python:mesos.interface',
+    # To prevent an alpha version of protobuf from being pulled down by pants we
+    # specify protobuf here. See AURORA-1128 for more details.
+    '3rdparty/python:protobuf',
     '3rdparty/python:twitter.common.log',
   ]
 )
@@ -74,6 +80,9 @@ python_library(
     ':status_manager',
     ':executor_base',
     '3rdparty/python:mesos.interface',
+    # To prevent an alpha version of protobuf from being pulled down by pants we
+    # specify protobuf here. See AURORA-1128 for more details.
+    '3rdparty/python:protobuf',
     '3rdparty/python:pystachio',
     '3rdparty/python:twitter.common.app',
     '3rdparty/python:twitter.common.concurrent',
@@ -93,6 +102,9 @@ python_library(
   dependencies = [
     ':executor_base',
     '3rdparty/python:mesos.interface',
+    # To prevent an alpha version of protobuf from being pulled down by pants we
+    # specify protobuf here. See AURORA-1128 for more details.
+    '3rdparty/python:protobuf',
     '3rdparty/python:psutil',
     '3rdparty/python:twitter.common.collections',
     '3rdparty/python:twitter.common.exceptions',

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/ae8a3fe0/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 1fa1e9e..6530f49 100644
--- a/src/main/python/apache/aurora/executor/bin/BUILD
+++ b/src/main/python/apache/aurora/executor/bin/BUILD
@@ -19,6 +19,9 @@ python_binary(
   always_write_cache = True,
   dependencies = [
     '3rdparty/python:mesos.native',
+    # To prevent an alpha version of protobuf from being pulled down by pants we
+    # specify protobuf here. See AURORA-1128 for more details.
+    '3rdparty/python:protobuf',
     '3rdparty/python:twitter.common.app',
     '3rdparty/python:twitter.common.log',
     '3rdparty/python:twitter.common.metrics',
@@ -42,6 +45,9 @@ python_binary(
   always_write_cache = True,
   dependencies = [
     '3rdparty/python:mesos.native',
+    # To prevent an alpha version of protobuf from being pulled down by pants we
+    # specify protobuf here. See AURORA-1128 for more details.
+    '3rdparty/python:protobuf',
     '3rdparty/python:twitter.common.app',
     '3rdparty/python:twitter.common.log',
     '3rdparty/python:twitter.common.metrics',

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/ae8a3fe0/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 93f6645..8cef41d 100644
--- a/src/main/python/apache/aurora/executor/common/BUILD
+++ b/src/main/python/apache/aurora/executor/common/BUILD
@@ -34,6 +34,9 @@ python_library(
   sources = ['status_checker.py'],
   dependencies = [
     '3rdparty/python:mesos.interface',
+    # To prevent an alpha version of protobuf from being pulled down by pants we
+    # specify protobuf here. See AURORA-1128 for more details.
+    '3rdparty/python:protobuf',
     '3rdparty/python:twitter.common.lang',
     '3rdparty/python:twitter.common.log',
     '3rdparty/python:twitter.common.metrics',
@@ -56,6 +59,9 @@ python_library(
     ':status_checker',
     ':task_info',
     '3rdparty/python:mesos.interface',
+    # To prevent an alpha version of protobuf from being pulled down by pants we
+    # specify protobuf here. See AURORA-1128 for more details.
+    '3rdparty/python:protobuf',
     '3rdparty/python:twitter.common.log',
     '3rdparty/python:twitter.common.exceptions',
     'src/main/python/apache/aurora/common:http_signaler',
@@ -92,6 +98,9 @@ python_library(
   sources = ['kill_manager.py'],
   dependencies = [
     '3rdparty/python:mesos.interface',
+    # To prevent an alpha version of protobuf from being pulled down by pants we
+    # specify protobuf here. See AURORA-1128 for more details.
+    '3rdparty/python:protobuf',
     ':status_checker',
   ]
 )


Mime
View raw message