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 B380210933 for ; Tue, 2 Dec 2014 23:10:47 +0000 (UTC) Received: (qmail 89978 invoked by uid 500); 2 Dec 2014 23:10:47 -0000 Delivered-To: apmail-aurora-commits-archive@aurora.apache.org Received: (qmail 89945 invoked by uid 500); 2 Dec 2014 23:10:47 -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 89936 invoked by uid 99); 2 Dec 2014 23:10:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Dec 2014 23:10:47 +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; Tue, 02 Dec 2014 23:10:43 +0000 Received: (qmail 89690 invoked by uid 99); 2 Dec 2014 23:10:19 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Dec 2014 23:10:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 27EA09BC907; Tue, 2 Dec 2014 23:10:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kevints@apache.org To: commits@aurora.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-aurora git commit: Use requirements.txt for 3rdparty/python. Date: Tue, 2 Dec 2014 23:10:19 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-aurora Updated Branches: refs/heads/master c86ca6d88 -> 552ae93d9 Use requirements.txt for 3rdparty/python. Also drop an unused Flask dependency and upgrade CherryPy to 3.6.0 (which has a functioning version on PyPI and thus doesn't need a custom repository set in the BUILD file). Testing Done: ./pants src/test/python:all Bugs closed: AURORA-617 Reviewed at https://reviews.apache.org/r/28610/ Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/552ae93d Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/552ae93d Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/552ae93d Branch: refs/heads/master Commit: 552ae93d9721e158a9361d0b8fd1d46420bfef39 Parents: c86ca6d Author: Kevin Sweeney Authored: Tue Dec 2 15:10:05 2014 -0800 Committer: Kevin Sweeney Committed: Tue Dec 2 15:10:05 2014 -0800 ---------------------------------------------------------------------- 3rdparty/python/BUILD | 57 +------------------- 3rdparty/python/requirements.txt | 36 +++++++++++++ .../python/apache/thermos/observer/bin/BUILD | 2 +- 3 files changed, 38 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/552ae93d/3rdparty/python/BUILD ---------------------------------------------------------------------- diff --git a/3rdparty/python/BUILD b/3rdparty/python/BUILD index 91cc1e8..7ef81d1 100644 --- a/3rdparty/python/BUILD +++ b/3rdparty/python/BUILD @@ -1,4 +1,3 @@ -# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -11,58 +10,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -def make_link(name, version, requirement=None): - python_requirement_library( - name = name, - requirements = [ - python_requirement('%s==%s' % (name, version) if requirement is None else requirement) - ] - ) - -python_requirement_library( - name = 'cherrypy', - requirements = [ - python_requirement('cherrypy==3.2.2', repository='http://download.cherrypy.org/cherrypy/3.2.2/') - ] -) - -COMMONS_VERSION = '0.3.2' -MESOS_VERSION = '0.20.1' - -make_link('bottle', '0.11.6') -make_link('Flask', '0.9') -make_link('mako', '0.4.0') -make_link('mesos.interface', MESOS_VERSION) -make_link('mesos.native', MESOS_VERSION) -make_link('mock', '1.0.1') -make_link('mox', '0.5.3') -make_link('psutil', '2.1.3') -make_link('pystachio', '0.7.2') -make_link('pyyaml', '3.10') -make_link('requests', '2.3.0') -make_link('thrift', '0.9.1') -make_link('twitter.common.app', COMMONS_VERSION) -make_link('twitter.common.collections', COMMONS_VERSION) -make_link('twitter.common.concurrent', COMMONS_VERSION) -make_link('twitter.common.config', COMMONS_VERSION) -make_link('twitter.common.confluence', COMMONS_VERSION) -make_link('twitter.common.contextutil', COMMONS_VERSION) -make_link('twitter.common.decorators', COMMONS_VERSION) -make_link('twitter.common.dirutil', COMMONS_VERSION) -make_link('twitter.common.exceptions', COMMONS_VERSION) -make_link('twitter.common.http', COMMONS_VERSION) -make_link('twitter.common.lang', COMMONS_VERSION) -make_link('twitter.common.log', COMMONS_VERSION) -make_link('twitter.common.metrics', COMMONS_VERSION) -make_link('twitter.common.options', COMMONS_VERSION) -make_link('twitter.common.process', COMMONS_VERSION) -make_link('twitter.common.python', '0.5.4') -make_link('twitter.common.quantity', COMMONS_VERSION) -make_link('twitter.common.recordio', COMMONS_VERSION) -make_link('twitter.common.rpc', COMMONS_VERSION) -make_link('twitter.common.string', COMMONS_VERSION) -make_link('twitter.common.testing', COMMONS_VERSION) -make_link('twitter.common.util', COMMONS_VERSION) -make_link('twitter.common.zookeeper', COMMONS_VERSION) -make_link('watchdog', '0.7.0') +python_requirements() http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/552ae93d/3rdparty/python/requirements.txt ---------------------------------------------------------------------- diff --git a/3rdparty/python/requirements.txt b/3rdparty/python/requirements.txt new file mode 100644 index 0000000..9d9e966 --- /dev/null +++ b/3rdparty/python/requirements.txt @@ -0,0 +1,36 @@ +bottle==0.11.6 +CherryPy==3.6.0 +mako==0.4.0 +mesos.interface==0.20.1 +mesos.native==0.20.1 +mock==1.0.1 +mox==0.5.3 +psutil==2.1.3 +pystachio==0.7.2 +pyyaml==3.10 +requests==2.3.0 +thrift==0.9.1 +twitter.common.app==0.3.2 +twitter.common.collections==0.3.2 +twitter.common.concurrent==0.3.2 +twitter.common.config==0.3.2 +twitter.common.confluence==0.3.2 +twitter.common.contextutil==0.3.2 +twitter.common.decorators==0.3.2 +twitter.common.dirutil==0.3.2 +twitter.common.exceptions==0.3.2 +twitter.common.http==0.3.2 +twitter.common.lang==0.3.2 +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 +twitter.common.string==0.3.2 +twitter.common.testing==0.3.2 +twitter.common.util==0.3.2 +twitter.common.zookeeper==0.3.2 +watchdog==0.7.0 http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/552ae93d/src/main/python/apache/thermos/observer/bin/BUILD ---------------------------------------------------------------------- diff --git a/src/main/python/apache/thermos/observer/bin/BUILD b/src/main/python/apache/thermos/observer/bin/BUILD index 9793132..15a03f7 100644 --- a/src/main/python/apache/thermos/observer/bin/BUILD +++ b/src/main/python/apache/thermos/observer/bin/BUILD @@ -17,7 +17,7 @@ python_binary( source = 'thermos_observer.py', entry_point = 'apache.thermos.observer.bin.thermos_observer:proxy_main', dependencies = [ - '3rdparty/python:cherrypy', + '3rdparty/python:CherryPy', '3rdparty/python:twitter.common.app', '3rdparty/python:twitter.common.exceptions', '3rdparty/python:twitter.common.http',