Return-Path: X-Original-To: apmail-aurora-commits-archive@minotaur.apache.org Delivered-To: apmail-aurora-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D20E110322 for ; Wed, 7 Jan 2015 00:53:00 +0000 (UTC) Received: (qmail 18485 invoked by uid 500); 7 Jan 2015 00:53:02 -0000 Delivered-To: apmail-aurora-commits-archive@aurora.apache.org Received: (qmail 18454 invoked by uid 500); 7 Jan 2015 00:53:02 -0000 Mailing-List: contact commits-help@aurora.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aurora.incubator.apache.org Delivered-To: mailing list commits@aurora.incubator.apache.org Received: (qmail 18445 invoked by uid 99); 7 Jan 2015 00:53:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jan 2015 00:53:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 07 Jan 2015 00:53:00 +0000 Received: (qmail 17706 invoked by uid 99); 7 Jan 2015 00:52:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jan 2015 00:52:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 01113A253DE; Wed, 7 Jan 2015 00:52:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wickman@apache.org To: commits@aurora.incubator.apache.org Message-Id: <5341c4bc651f4218a0f8283ba717dfff@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-aurora git commit: Replace twitter.common.python dependency with a direct pex dependency (at the latest version). Date: Wed, 7 Jan 2015 00:52:39 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-aurora Updated Branches: refs/heads/master 8c49029b6 -> 108941310 Replace twitter.common.python dependency with a direct pex dependency (at the latest version). Testing Done: ./pants build src/test/python/apache/aurora:all bash src/test/sh/org/apache/aurora/e2e/test_end_to_end_v2.sh bash src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh Reviewed at https://reviews.apache.org/r/29586/ Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/10894131 Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/10894131 Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/10894131 Branch: refs/heads/master Commit: 108941310148ed21544e28ec1252735b6c809dd5 Parents: 8c49029 Author: Joshua Cohen Authored: Tue Jan 6 16:52:04 2015 -0800 Committer: Brian Wickman Committed: Tue Jan 6 16:52:04 2015 -0800 ---------------------------------------------------------------------- 3rdparty/python/requirements.txt | 2 +- src/main/python/apache/aurora/client/cli/BUILD | 4 ++-- src/main/python/apache/aurora/client/commands/BUILD | 2 +- src/main/python/apache/aurora/common/BUILD | 2 +- src/main/python/apache/aurora/common/pex_version.py | 2 +- src/main/python/apache/aurora/executor/BUILD | 2 +- src/main/python/apache/aurora/executor/executor_vars.py | 2 +- src/test/python/apache/aurora/common/test_pex_version.py | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/10894131/3rdparty/python/requirements.txt ---------------------------------------------------------------------- diff --git a/3rdparty/python/requirements.txt b/3rdparty/python/requirements.txt index 05bbf33..b5a0017 100644 --- a/3rdparty/python/requirements.txt +++ b/3rdparty/python/requirements.txt @@ -5,6 +5,7 @@ mesos.interface==0.20.1 mesos.native==0.20.1 mock==1.0.1 mox==0.5.3 +pex==0.8.2 psutil==2.1.3 pystachio==0.7.2 pyyaml==3.10 @@ -23,7 +24,6 @@ twitter.common.log==0.3.2 twitter.common.metrics==0.3.2 twitter.common.options==0.3.2 twitter.common.process==0.3.2 -twitter.common.python==0.5.4 twitter.common.quantity==0.3.2 twitter.common.recordio==0.3.2 twitter.common.rpc==0.3.2 http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/10894131/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 57683ae..8bcaccc 100644 --- a/src/main/python/apache/aurora/client/cli/BUILD +++ b/src/main/python/apache/aurora/client/cli/BUILD @@ -32,7 +32,7 @@ python_library( dependencies = [ ':cli', ':bridge', - '3rdparty/python:twitter.common.python', + '3rdparty/python:pex', 'src/main/python/apache/aurora/client/bin:aurora_admin_lib', 'src/main/python/apache/aurora/client/bin:aurora_client_lib' ] @@ -55,9 +55,9 @@ python_library( 'update.py', ], dependencies = [ + '3rdparty/python:pex', '3rdparty/python:requests', '3rdparty/python:twitter.common.log', - '3rdparty/python:twitter.common.python', '3rdparty/python:twitter.common.quantity', 'src/main/python/apache/aurora/client/api:command_runner', 'src/main/python/apache/aurora/client/api:disambiguator', http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/10894131/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 78a2f57..33cd91f 100644 --- a/src/main/python/apache/aurora/client/commands/BUILD +++ b/src/main/python/apache/aurora/client/commands/BUILD @@ -57,7 +57,7 @@ python_library( dependencies = [ '3rdparty/python:twitter.common.app', '3rdparty/python:twitter.common.log', - '3rdparty/python:twitter.common.python', + '3rdparty/python:pex', 'src/main/python/apache/aurora/client/api:command_runner', 'src/main/python/apache/aurora/client/api:disambiguator', 'src/main/python/apache/aurora/client/api:job_monitor', http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/10894131/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 1c6464d..1fe703f 100644 --- a/src/main/python/apache/aurora/common/BUILD +++ b/src/main/python/apache/aurora/common/BUILD @@ -62,7 +62,7 @@ python_library( name = 'pex_version', sources = ['pex_version.py'], dependencies = [ - '3rdparty/python:twitter.common.python', + '3rdparty/python:pex', ] ) http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/10894131/src/main/python/apache/aurora/common/pex_version.py ---------------------------------------------------------------------- diff --git a/src/main/python/apache/aurora/common/pex_version.py b/src/main/python/apache/aurora/common/pex_version.py index 6aecd8a..837ef1a 100644 --- a/src/main/python/apache/aurora/common/pex_version.py +++ b/src/main/python/apache/aurora/common/pex_version.py @@ -14,7 +14,7 @@ from zipfile import BadZipfile -from twitter.common.python.pex import PexInfo +from pex.pex import PexInfo class UnknownVersion(Exception): http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/10894131/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 72d1ec5..79037bc 100644 --- a/src/main/python/apache/aurora/executor/BUILD +++ b/src/main/python/apache/aurora/executor/BUILD @@ -45,10 +45,10 @@ python_library( name = 'executor_vars', sources = ['executor_vars.py'], dependencies = [ + '3rdparty/python:pex', '3rdparty/python:psutil', '3rdparty/python:twitter.common.exceptions', '3rdparty/python:twitter.common.metrics', - '3rdparty/python:twitter.common.python', '3rdparty/python:twitter.common.quantity', '3rdparty/python:twitter.common.string', ] http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/10894131/src/main/python/apache/aurora/executor/executor_vars.py ---------------------------------------------------------------------- diff --git a/src/main/python/apache/aurora/executor/executor_vars.py b/src/main/python/apache/aurora/executor/executor_vars.py index 7c01827..dfa1a66 100644 --- a/src/main/python/apache/aurora/executor/executor_vars.py +++ b/src/main/python/apache/aurora/executor/executor_vars.py @@ -17,9 +17,9 @@ import time from zipfile import BadZipfile import psutil +from pex.pex import PexInfo from twitter.common.exceptions import ExceptionalThread from twitter.common.metrics import LambdaGauge, MutatorGauge, NamedGauge, Observable -from twitter.common.python.pex import PexInfo from twitter.common.quantity import Amount, Time from twitter.common.string.scanf import ScanfParser http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/10894131/src/test/python/apache/aurora/common/test_pex_version.py ---------------------------------------------------------------------- diff --git a/src/test/python/apache/aurora/common/test_pex_version.py b/src/test/python/apache/aurora/common/test_pex_version.py index 7280f70..3e6e284 100644 --- a/src/test/python/apache/aurora/common/test_pex_version.py +++ b/src/test/python/apache/aurora/common/test_pex_version.py @@ -16,7 +16,7 @@ from zipfile import BadZipfile import mock import pytest -from twitter.common.python.pex import PexInfo +from pex.pex import PexInfo from apache.aurora.common.pex_version import pex_version, UnknownVersion