aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wick...@apache.org
Subject incubator-aurora git commit: Upgrade pants to 0.0.27
Date Fri, 16 Jan 2015 22:49:50 GMT
Repository: incubator-aurora
Updated Branches:
  refs/heads/master da74e282b -> be5d91837


Upgrade pants to 0.0.27

Ports aurora repo to use pants 0.0.27 using the new pants new command
processor.

Testing Done:
bash src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh

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


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

Branch: refs/heads/master
Commit: be5d91837c49f6147e06ea74a092ebe80ccc2837
Parents: da74e28
Author: Brian Wickman <wickman@apache.org>
Authored: Fri Jan 16 14:49:44 2015 -0800
Committer: Brian Wickman <wickman@apache.org>
Committed: Fri Jan 16 14:49:44 2015 -0800

----------------------------------------------------------------------
 .pantsversion                                   |  2 +-
 build-support/jenkins/build.sh                  |  4 +-
 build-support/pants_requirements.txt            | 41 ++++++++++----------
 build-support/python/make-pycharm-virtualenv    |  6 +--
 build-support/python/update-pants-requirements  |  2 +-
 build-support/release/make-python-sdists        |  2 +-
 docs/developing-aurora-client.md                |  4 +-
 examples/vagrant/aurorabuild.sh                 | 12 +++---
 pants                                           |  2 +-
 .../aurora/executor/test_thermos_executor.py    |  2 +-
 .../aurora/executor/test_thermos_task_runner.py |  2 +-
 11 files changed, 39 insertions(+), 40 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/be5d9183/.pantsversion
----------------------------------------------------------------------
diff --git a/.pantsversion b/.pantsversion
index 43b2961..24ff855 100644
--- a/.pantsversion
+++ b/.pantsversion
@@ -1 +1 @@
-0.0.13
+0.0.27

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/be5d9183/build-support/jenkins/build.sh
----------------------------------------------------------------------
diff --git a/build-support/jenkins/build.sh b/build-support/jenkins/build.sh
index 8de19cd..6f9f017 100755
--- a/build-support/jenkins/build.sh
+++ b/build-support/jenkins/build.sh
@@ -28,11 +28,9 @@ mkdir -p third_party
 pip install -d third_party -r <(grep -v mesos.native 3rdparty/python/requirements.txt)
 
 # Run all Python tests
-# Setting the timeout value to 1 minute ensures package fetches from PyPI do not
-# fail on Apache Jenkins.
 export JUNIT_XML_BASE="$PWD/dist/test-results"
 mkdir -p "$JUNIT_XML_BASE"
-./pants build --timeout=60 src/test/python:all -vxs
+./pants test.pytest --no-fast src/test/python::
 
 # Run Python style checks
 ./build-support/python/isort-check

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/be5d9183/build-support/pants_requirements.txt
----------------------------------------------------------------------
diff --git a/build-support/pants_requirements.txt b/build-support/pants_requirements.txt
index 9a790f9..fb9a2d2 100644
--- a/build-support/pants_requirements.txt
+++ b/build-support/pants_requirements.txt
@@ -5,28 +5,29 @@
 Markdown==2.1.1
 Pygments==1.4
 ansicolors==1.0.2
-cov-core==1.14.0
+cov-core==1.15.0
 coverage==3.7.1
+docutils==0.12
 lockfile==0.10.2
-pantsbuild.pants==0.0.24
-pex==0.7.0
+pantsbuild.pants==0.0.27
+pex==0.8.2
 psutil==1.1.3
-py==1.4.25
+py==1.4.26
 pystache==0.5.3
-pytest==2.6.3
-pytest-cov==1.8.0
-python-daemon==1.5.5
+pytest==2.6.4
+pytest-cov==1.8.1
 requests==2.3.0
-twitter.common.collections==0.3.1
-twitter.common.config==0.3.1
-twitter.common.confluence==0.3.1
-twitter.common.contextutil==0.3.1
-twitter.common.decorators==0.3.1
-twitter.common.dirutil==0.3.1
-twitter.common.lang==0.3.1
-twitter.common.log==0.3.1
-twitter.common.options==0.3.1
-twitter.common.process==0.3.1
-twitter.common.string==0.3.1
-twitter.common.threading==0.3.1
-twitter.common.util==0.3.1
+six==1.8.0
+twitter.common.collections==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.lang==0.3.2
+twitter.common.log==0.3.2
+twitter.common.options==0.3.2
+twitter.common.process==0.3.2
+twitter.common.string==0.3.2
+twitter.common.threading==0.3.2
+twitter.common.util==0.3.2

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/be5d9183/build-support/python/make-pycharm-virtualenv
----------------------------------------------------------------------
diff --git a/build-support/python/make-pycharm-virtualenv b/build-support/python/make-pycharm-virtualenv
index 85e8137..84dfb64 100755
--- a/build-support/python/make-pycharm-virtualenv
+++ b/build-support/python/make-pycharm-virtualenv
@@ -21,9 +21,9 @@ VENV_DIR=build-support/python/pycharm.venv
 PROJECT_NAME=${PWD##*/}
 
 pushd "$BUILDROOT"
-  ./pants goal dependencies --dependencies-external src/test/python:all > requirements.txt
-  ./pants setup_py api/src/main/thrift/org/apache/aurora/gen:py-thrift-packaged
-  ./pants setup_py api/src/main/thrift/org/apache/thermos:py-thrift
+  ./pants dependencies --external-only src/test/python:: | sort -u > requirements.txt
+  ./pants setup-py api/src/main/thrift/org/apache/aurora/gen:py-thrift-packaged
+  ./pants setup-py api/src/main/thrift/org/apache/thermos:py-thrift
   source build-support/pants.venv/bin/activate
     pytest_requirement=$(pip freeze | grep pytest==)
     pytest_cov_requirement=$(pip freeze | grep pytest-cov==)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/be5d9183/build-support/python/update-pants-requirements
----------------------------------------------------------------------
diff --git a/build-support/python/update-pants-requirements b/build-support/python/update-pants-requirements
index 523a3cb..ae210bc 100755
--- a/build-support/python/update-pants-requirements
+++ b/build-support/python/update-pants-requirements
@@ -17,7 +17,7 @@ set -ex
 
 HERE=$(cd `dirname "${BASH_SOURCE[0]}"` && pwd)
 BUILD_SUPPORT=$(dirname $HERE)
-PANTS_VERSION=0.0.24
+PANTS_VERSION=$(cat $HERE/../../.pantsversion)
 
 PANTS_VENV_PATH="$BUILD_SUPPORT/pants-requirements.venv"
 rm -rf "$PANTS_VENV_PATH"

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/be5d9183/build-support/release/make-python-sdists
----------------------------------------------------------------------
diff --git a/build-support/release/make-python-sdists b/build-support/release/make-python-sdists
index 2f437d3..9608f68 100755
--- a/build-support/release/make-python-sdists
+++ b/build-support/release/make-python-sdists
@@ -54,5 +54,5 @@ fi
 source build-support/make-python-sdists.venv/bin/activate
 
 for t in "${TARGETS[@]}"; do
-  ./pants setup_py $t
+  ./pants setup-py $t
 done

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/be5d9183/docs/developing-aurora-client.md
----------------------------------------------------------------------
diff --git a/docs/developing-aurora-client.md b/docs/developing-aurora-client.md
index 7734bd1..4062b09 100644
--- a/docs/developing-aurora-client.md
+++ b/docs/developing-aurora-client.md
@@ -19,8 +19,8 @@ Building and Testing the Client
 Building and testing the client code are both done using Pants. The relevant targets to know
about
 are:
 
-   * Build a client executable: `./pants src/main/python/apache/aurora/client/cli:aurora`
-   * Test client code: `./pants ./pants src/test/python/apache/aurora/client/cli:all`
+   * Build a client executable: `./pants binary src/main/python/apache/aurora/client/cli:aurora`
+   * Test client code: `./pants test src/test/python/apache/aurora/client/cli:all`
 
 Running/Debugging the Client
 ============================

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/be5d9183/examples/vagrant/aurorabuild.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/aurorabuild.sh b/examples/vagrant/aurorabuild.sh
index 1e31f21..f692f02 100755
--- a/examples/vagrant/aurorabuild.sh
+++ b/examples/vagrant/aurorabuild.sh
@@ -33,12 +33,12 @@ function upstart_update {
 }
 
 function build_client {
-  ./pants src/main/python/apache/aurora/client/cli:aurora
+  ./pants binary src/main/python/apache/aurora/client/cli:aurora
   sudo ln -sf $DIST_DIR/aurora.pex /usr/local/bin/aurora
 }
 
 function build_admin_client {
-  ./pants src/main/python/apache/aurora/admin:aurora_admin
+  ./pants binary src/main/python/apache/aurora/admin:aurora_admin
   sudo ln -sf $DIST_DIR/aurora_admin.pex /usr/local/bin/aurora_admin
 }
 
@@ -58,9 +58,9 @@ function build_scheduler {
 }
 
 function build_executor {
-  ./pants src/main/python/apache/aurora/executor/bin:gc_executor
-  ./pants src/main/python/apache/aurora/executor/bin:thermos_executor
-  ./pants src/main/python/apache/thermos/bin:thermos_runner
+  ./pants binary src/main/python/apache/aurora/executor/bin:gc_executor
+  ./pants binary src/main/python/apache/aurora/executor/bin:thermos_executor
+  ./pants binary src/main/python/apache/thermos/bin:thermos_runner
 
   # Package runner within executor.
   python <<EOF
@@ -80,7 +80,7 @@ EOF
 }
 
 function build_observer {
-  ./pants src/main/python/apache/thermos/observer/bin:thermos_observer
+  ./pants binary src/main/python/apache/thermos/observer/bin:thermos_observer
   upstart_update aurora-thermos-observer
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/be5d9183/pants
----------------------------------------------------------------------
diff --git a/pants b/pants
index 40ddcf3..9dd3188 100755
--- a/pants
+++ b/pants
@@ -16,7 +16,7 @@
 set -e
 
 HERE=$(cd `dirname "${BASH_SOURCE[0]}"` && pwd)
-PANTS_VERSION=0.0.24
+PANTS_VERSION=$(cat $HERE/.pantsversion)
 # Pinned pants requirements - to upgrade pants change this file.
 PANTS_REQUIREMENTS="$HERE/build-support/pants_requirements.txt"
 if ! [ -f "$HERE/build-support/pants.venv/BOOTSTRAPPED" ] || \

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/be5d9183/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 503e62f..6c8ae1c 100644
--- a/src/test/python/apache/aurora/executor/test_thermos_executor.py
+++ b/src/test/python/apache/aurora/executor/test_thermos_executor.py
@@ -269,7 +269,7 @@ class TestThermosExecutor(object):
     LogOptions.set_disk_log_level('DEBUG')
     log.init('executor_logger')
     if not cls.PANTS_BUILT and 'SKIP_PANTS_BUILD' not in os.environ:
-      assert subprocess.call(["./pants",
+      assert subprocess.call(["./pants", "binary",
           "src/main/python/apache/thermos/bin:thermos_runner"]) == 0
       cls.PANTS_BUILT = True
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/be5d9183/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 f8cf9fc..6b24bbb 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
@@ -65,7 +65,7 @@ class TestThermosTaskRunnerIntegration(object):
     LogOptions.set_disk_log_level('DEBUG')
     log.init('executor_logger')
     if not cls.PANTS_BUILT and 'SKIP_PANTS_BUILD' not in os.environ:
-      assert subprocess.call(["./pants",
+      assert subprocess.call(["./pants", "binary",
           "src/main/python/apache/thermos/bin:thermos_runner"]) == 0
       cls.PANTS_BUILT = True
 


Mime
View raw message