You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by wi...@apache.org on 2014/07/16 02:00:25 UTC

git commit: AURORA-583: Upgrade to public release of pants

Repository: incubator-aurora
Updated Branches:
  refs/heads/master 1b856016c -> 272fc2635


AURORA-583: Upgrade to public release of pants

Point pants at the public release instead of github fork.  Upgrades pex to
0.5.9 while we're at it.

Testing Done:
./pants src/test/python/apache/aurora:all -v

Bugs closed: AURORA-583

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


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

Branch: refs/heads/master
Commit: 272fc2635be11c064c7c93e3fc1268398a5cd708
Parents: 1b85601
Author: Brian Wickman <wi...@apache.org>
Authored: Tue Jul 15 17:00:05 2014 -0700
Committer: Brian Wickman <wi...@apache.org>
Committed: Tue Jul 15 17:00:05 2014 -0700

----------------------------------------------------------------------
 build-support/pex |  2 +-
 pants             | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/272fc263/build-support/pex
----------------------------------------------------------------------
diff --git a/build-support/pex b/build-support/pex
index f96c02a..61fbc91 100755
--- a/build-support/pex
+++ b/build-support/pex
@@ -15,7 +15,7 @@
 # Wrapper script for self-bootstrapping pex.
 set -e
 
-TWITTER_COMMON_PYTHON_VERSION=0.5.6
+TWITTER_COMMON_PYTHON_VERSION=0.5.9
 
 if which python2.7 >/dev/null; then
   PY=`which python2.7`

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/272fc263/pants
----------------------------------------------------------------------
diff --git a/pants b/pants
index 36c6afa..e8c3bcf 100755
--- a/pants
+++ b/pants
@@ -18,20 +18,15 @@ set -o nounset
 HERE=$(cd `dirname "${BASH_SOURCE[0]}"` && pwd)
 
 PANTS_VERSION=0.0.17
-PANTS_GIT_SHA=dccd515fb684421f4122df6ff425bfd07359606f
-if ! [[ -e "$HERE/build-support/pants-$PANTS_VERSION.pex" ]]; then
+if ! [[ -e "$HERE/build-support/pantsbuild.pants-$PANTS_VERSION.pex" ]]; then
   echo "Building pants.pex @ $PANTS_VERSION"
-  #TODO(yasumoto): We need to migrate to a published version of pants once
-  # pantsbuild does a release.
   "$HERE/build-support/pex" \
     -v \
     --requirement "pantsbuild.pants==$PANTS_VERSION" \
     --entry-point pants.bin.pants_exe:main \
-    --repo "https://yasumoto.github.io/cheeseshop/pantsbuild/pants/$PANTS_GIT_SHA/index.html" \
-    --no-wheel \
-    -p "$HERE/build-support/pants-$PANTS_VERSION.pex.tmp"
-  mv "$HERE/build-support/pants-$PANTS_VERSION.pex.tmp" "$HERE/build-support/pants-$PANTS_VERSION.pex"  # 2PC
-  echo "Built pants-$PANTS_VERSION.pex"
+    -p "$HERE/build-support/pantsbuild.pants-$PANTS_VERSION.pex.tmp"
+  mv "$HERE/build-support/pantsbuild.pants-$PANTS_VERSION.pex.tmp" "$HERE/build-support/pantsbuild.pants-$PANTS_VERSION.pex"  # 2PC
+  echo "Built pantsbuild.pants-$PANTS_VERSION.pex"
 fi
 
-exec "$HERE/build-support/pants-$PANTS_VERSION.pex" "$@"
+exec "$HERE/build-support/pantsbuild.pants-$PANTS_VERSION.pex" "$@"