aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wfar...@apache.org
Subject aurora git commit: Upgrade Aurora to pants 0.0.57.
Date Tue, 10 Nov 2015 23:27:59 GMT
Repository: aurora
Updated Branches:
  refs/heads/master 3ea1b26ae -> 872aa79d1


Upgrade Aurora to pants 0.0.57.

Bugs closed: AURORA-1499

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


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

Branch: refs/heads/master
Commit: 872aa79d1bad5b728abd74d83f62f1d374d9f5e8
Parents: 3ea1b26
Author: John Sirois <john.sirois@gmail.com>
Authored: Tue Nov 10 15:27:53 2015 -0800
Committer: Bill Farner <wfarner@apache.org>
Committed: Tue Nov 10 15:27:53 2015 -0800

----------------------------------------------------------------------
 .auroraversion                                  |   2 +-
 .pantsversion                                   |   1 -
 3rdparty/python/requirements.txt                |   2 +-
 BUILD                                           |  25 -----
 BUILD.tools                                     |  21 +++-
 api/src/main/thrift/org/apache/aurora/gen/BUILD |   7 ++
 api/src/main/thrift/org/apache/thermos/BUILD    |   5 +-
 build-support/jenkins/build.sh                  |   4 +-
 build-support/pants_requirements.txt            |  30 ------
 build-support/python/make-pycharm-virtualenv    |  11 +-
 build-support/python/update-pants-requirements  |  34 -------
 build-support/release/release                   |   3 +-
 build-support/release/release-candidate         |   5 +-
 pants                                           | 102 +++++++++++++++----
 pants.ini                                       |  68 +------------
 src/main/python/apache/aurora/client/BUILD      |   2 +-
 .../apache/aurora/client/cli/.auroraversion     |   1 +
 src/main/python/apache/aurora/client/cli/BUILD  |  18 ++++
 src/main/python/apache/aurora/tools/BUILD       |   2 +-
 src/main/python/apache/thermos/observer/BUILD   |   2 +-
 .../apache/aurora/client/cli/.auroraversion     |   1 -
 .../resources/apache/aurora/client/cli/BUILD    |  18 ----
 22 files changed, 152 insertions(+), 212 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/.auroraversion
----------------------------------------------------------------------
diff --git a/.auroraversion b/.auroraversion
deleted file mode 120000
index d2cbead..0000000
--- a/.auroraversion
+++ /dev/null
@@ -1 +0,0 @@
-src/main/resources/apache/aurora/client/cli/.auroraversion
\ No newline at end of file
diff --git a/.auroraversion b/.auroraversion
new file mode 100644
index 0000000..67ff1ac
--- /dev/null
+++ b/.auroraversion
@@ -0,0 +1 @@
+0.11.0-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/.pantsversion
----------------------------------------------------------------------
diff --git a/.pantsversion b/.pantsversion
deleted file mode 100644
index 78bae5b..0000000
--- a/.pantsversion
+++ /dev/null
@@ -1 +0,0 @@
-0.0.32

http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/3rdparty/python/requirements.txt
----------------------------------------------------------------------
diff --git a/3rdparty/python/requirements.txt b/3rdparty/python/requirements.txt
index 27a2c77..3a78b75 100644
--- a/3rdparty/python/requirements.txt
+++ b/3rdparty/python/requirements.txt
@@ -5,7 +5,7 @@ mesos.interface==0.23.0
 mesos.native==0.23.0
 mock==1.0.1
 mox==0.5.3
-pex==0.8.2
+pex==1.1.0
 protobuf==2.6.1
 psutil==3.2.2
 pystachio==0.8.0

http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/BUILD
----------------------------------------------------------------------
diff --git a/BUILD b/BUILD
deleted file mode 100644
index 7de0c74..0000000
--- a/BUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# 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
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-source_root('api/src/main/thrift', python_library, python_thrift_library)
-
-source_root('src/main/python', page, python_binary, python_library, resources)
-source_root('src/main/resources', python_library, resources)
-source_root('src/main/thrift', python_library, python_thrift_library)
-
-# TODO(wickman) get rid of PythonLibrary from src/test/python:
-#   src/test/python/apache/aurora/client/BUILD:python_library(
-#   src/test/python/apache/aurora/client/cli/BUILD:python_library(
-#   src/test/python/apache/aurora/client/commands/BUILD:python_library(
-source_root('src/test/python', python_tests, python_test_suite, python_library)

http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/BUILD.tools
----------------------------------------------------------------------
diff --git a/BUILD.tools b/BUILD.tools
index 75698a5..2e237c4 100644
--- a/BUILD.tools
+++ b/BUILD.tools
@@ -1,3 +1,18 @@
-# TODO(wickman) Remove this once https://github.com/pantsbuild/pants/issues/867 is solved.
-jar_library(name = 'nailgun-server',
-            jars = [jar(org = 'com.martiansoftware', name = 'nailgun-server', rev = '0.9.1')])
+# TODO(jsirois) Remove this once https://github.com/pantsbuild/pants/issues/867 is solved.
+
+# JVM artifacts that Pants itself depends on.
+# http://pantsbuild.github.io/dev_tasks.html#jvm-tool-bootstrapping
+
+jar_library(name='scala-compiler',
+            jars=[
+              jar(org='org.scala-lang', name='scala-compiler', rev='2.10.6'),
+            ])
+
+jar_library(name='scala-repl',
+            jars=[
+              jar(org='org.scala-lang', name='jline', rev='2.10.6', intransitive=True),
+            ],
+            dependencies=[
+              ':scala-compiler',
+            ])
+

http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/api/src/main/thrift/org/apache/aurora/gen/BUILD
----------------------------------------------------------------------
diff --git a/api/src/main/thrift/org/apache/aurora/gen/BUILD b/api/src/main/thrift/org/apache/aurora/gen/BUILD
index 2dcc46d..f4004a3 100644
--- a/api/src/main/thrift/org/apache/aurora/gen/BUILD
+++ b/api/src/main/thrift/org/apache/aurora/gen/BUILD
@@ -21,17 +21,24 @@ python_thrift_library(
   sources = [
     'api.thrift',
   ],
+  dependencies = [
+    '3rdparty/python:thrift',
+  ],
 )
 
 python_thrift_library(
   name = '_test',
   sources = TEST_DATA,
+  dependencies = [
+    '3rdparty/python:thrift',
+  ],
 )
 
 python_thrift_library(
   name = '_storage',
   sources = ['storage.thrift'],
   dependencies = [
+    '3rdparty/python:thrift',
     ':_api',
   ],
 )

http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/api/src/main/thrift/org/apache/thermos/BUILD
----------------------------------------------------------------------
diff --git a/api/src/main/thrift/org/apache/thermos/BUILD b/api/src/main/thrift/org/apache/thermos/BUILD
index 6b13949..cb655a2 100644
--- a/api/src/main/thrift/org/apache/thermos/BUILD
+++ b/api/src/main/thrift/org/apache/thermos/BUILD
@@ -21,5 +21,8 @@ python_thrift_library(
     name = 'apache.thermos.thrift',
     version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().upper(),
     description = 'Autogenerated Thermos thrift schemas.',
-  )
+  ),
+  dependencies = [
+    '3rdparty/python:thrift',
+  ],
 )

http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/build-support/jenkins/build.sh
----------------------------------------------------------------------
diff --git a/build-support/jenkins/build.sh b/build-support/jenkins/build.sh
index 5606bb1..5cd5242 100755
--- a/build-support/jenkins/build.sh
+++ b/build-support/jenkins/build.sh
@@ -32,9 +32,7 @@ python -m pip install -d third_party -r <(grep -v mesos.native 3rdparty/python/r
 ./build-support/python/checkstyle-check src
 
 # Run all Python tests
-export JUNIT_XML_BASE="$PWD/dist/test-results"
-mkdir -p "$JUNIT_XML_BASE"
-./pants test.pytest --no-fast --options='-v' src/test/python::
+./pants test.pytest --no-fast --junit-xml-dir="$PWD/dist/test-results" src/test/python::
-- -v
 
 # Ensure we can build python sdists (AURORA-1174)
 ./build-support/release/make-python-sdists

http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/build-support/pants_requirements.txt
----------------------------------------------------------------------
diff --git a/build-support/pants_requirements.txt b/build-support/pants_requirements.txt
deleted file mode 100644
index 6eefa71..0000000
--- a/build-support/pants_requirements.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# This file is generated automatically. Do not modify it manually! Instead it
-# can be updated by running ./build-support/python/update-pants-requirements.
-#
-ansicolors==1.0.2
-cov-core==1.15.0
-coverage==3.7.1
-docutils==0.12
-lockfile==0.10.2
-Markdown==2.1.1
-pantsbuild.pants==0.0.32
-pex==0.8.6
-psutil==1.1.3
-py==1.4.30
-Pygments==1.4
-pystache==0.5.3
-pytest==2.6.4
-pytest-cov==1.8.1
-requests==2.5.3
-six==1.8.0
-twitter.common.collections==0.3.4
-twitter.common.config==0.3.4
-twitter.common.confluence==0.3.4
-twitter.common.contextutil==0.3.4
-twitter.common.dirutil==0.3.4
-twitter.common.lang==0.3.4
-twitter.common.log==0.3.4
-twitter.common.options==0.3.4
-twitter.common.threading==0.3.4
-twitter.common.util==0.3.4

http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/build-support/python/make-pycharm-virtualenv
----------------------------------------------------------------------
diff --git a/build-support/python/make-pycharm-virtualenv b/build-support/python/make-pycharm-virtualenv
index d7bd418..0f422d6 100755
--- a/build-support/python/make-pycharm-virtualenv
+++ b/build-support/python/make-pycharm-virtualenv
@@ -24,10 +24,19 @@ pushd "$BUILDROOT"
   ./pants dependencies --external-only src/test/python:: | sort -u > requirements.txt
   ./pants setup-py api/src/main/thrift/org/apache/aurora/gen
   ./pants setup-py api/src/main/thrift/org/apache/thermos
-  source build-support/pants.venv/bin/activate
+
+  # Here we grab the version of pytest libs used by pants in a fairly awkward way.
+  # TODO(John Sirois): Either get this info from the current pants install itself instead
of
+  # using a parallel ephemeral install like we do here (slow), or else invert things and
+  # allow user-control of the pytest lib versions within reason.
+  rm -rf "$VENV_DIR"
+  ./build-support/virtualenv "$VENV_DIR"
+  source $VENV_DIR/bin/activate
+    python -m pip install pantsbuild.pants==$(./pants --version)
     pytest_requirement=$(python -m pip freeze | grep pytest==)
     pytest_cov_requirement=$(python -m pip freeze | grep pytest-cov==)
   deactivate
+
   rm -rf "$VENV_DIR"
   ./build-support/virtualenv "$VENV_DIR"
   source $VENV_DIR/bin/activate

http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/build-support/python/update-pants-requirements
----------------------------------------------------------------------
diff --git a/build-support/python/update-pants-requirements b/build-support/python/update-pants-requirements
deleted file mode 100755
index 82f7c51..0000000
--- a/build-support/python/update-pants-requirements
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Script to update pants_requirements.txt
-set -ex
-
-HERE=$(cd `dirname "${BASH_SOURCE[0]}"` && pwd)
-BUILD_SUPPORT=$(dirname $HERE)
-PANTS_VERSION=$(cat $HERE/../../.pantsversion)
-
-PANTS_VENV_PATH="$BUILD_SUPPORT/pants-requirements.venv"
-rm -rf "$PANTS_VENV_PATH"
-"$BUILD_SUPPORT/virtualenv" "$PANTS_VENV_PATH"
-source "$PANTS_VENV_PATH/bin/activate"
-python -m pip install pantsbuild.pants==$PANTS_VERSION
-cat <<EOF > "$BUILD_SUPPORT/pants_requirements.txt"
-#
-# This file is generated automatically. Do not modify it manually! Instead it
-# can be updated by running ./build-support/python/update-pants-requirements.
-#
-EOF
-
-pip freeze -l >> "$BUILD_SUPPORT/pants_requirements.txt"

http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/build-support/release/release
----------------------------------------------------------------------
diff --git a/build-support/release/release b/build-support/release/release
index 2090457..2d4b895 100755
--- a/build-support/release/release
+++ b/build-support/release/release
@@ -22,7 +22,6 @@ set -o nounset
 aurora_git_web_url='https://git-wip-us.apache.org/repos/asf?p=aurora.git'
 aurora_svn_dist_url='https://dist.apache.org/repos/dist/release/aurora'
 aurora_svn_dev_dist_url='https://dist.apache.org/repos/dist/dev/aurora'
-aurora_version_file='./src/main/resources/apache/aurora/client/cli/.auroraversion'
 
 function print_help_and_exit {
 cat <<EOF
@@ -134,7 +133,7 @@ if [[ $publish == 1 ]]; then
 
   # Increment the version and create a branch
   echo ${current_version_tag} > .auroraversion
-  git add ${aurora_version_file}
+  git add .auroraversion
   git commit -m "Updating .auroraversion to release version ${current_version_tag}."
   git push origin "${current_version_tag}"
   git tag -s "${current_version_tag}" -m "Apache Aurora ${current_version_tag} release" ${current_version_tag}

http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/build-support/release/release-candidate
----------------------------------------------------------------------
diff --git a/build-support/release/release-candidate b/build-support/release/release-candidate
index 1caa56b..94011a5 100755
--- a/build-support/release/release-candidate
+++ b/build-support/release/release-candidate
@@ -30,7 +30,6 @@ rc_tag_version=0
 override_version=''
 aurora_git_web_url='https://git-wip-us.apache.org/repos/asf?p=aurora.git'
 aurora_svn_dist_url='https://dist.apache.org/repos/dist/dev/aurora'
-aurora_version_file='./src/main/resources/apache/aurora/client/cli/.auroraversion'
 
 function print_help_and_exit {
 cat <<EOF
@@ -184,7 +183,7 @@ git branch $current_version_tag $(git rev-parse HEAD)
 
 echo "Committing updated .auroraversion on master"
 echo $new_snapshot_version > .auroraversion
-git add ${aurora_version_file}
+git add .auroraversion
 git commit -m "Incrementing snapshot version to ${new_snapshot_version}."
 
 # Build the source distribution from the new branch
@@ -192,7 +191,7 @@ echo "Checking out ${current_version_tag} branch and updating .auroraversion"
 git checkout $current_version_tag
 # Increment the version and create a branch
 echo $current_version_tag > .auroraversion
-git add ${aurora_version_file}
+git add .auroraversion
 git commit -m "Updating .auroraversion to ${current_version_tag}."
 
 echo "Building the source distribution"

http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/pants
----------------------------------------------------------------------
diff --git a/pants b/pants
index 6f3526e..4709799 100755
--- a/pants
+++ b/pants
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 #
+#
 # 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,25 +12,84 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+# =============================== NOTE ===============================
+# This pants bootstrap script comes from the pantsbuild/setup
+# project and is intended to be checked into your code repository so
+# that any developer can check out your code and be building it with
+# pants with no prior setup needed.
+#
+# You can learn more here: https://pantsbuild.github.io/setup
+# ====================================================================
+
+PYTHON=${PYTHON:-$(which python2.7)}
+
+PANTS_HOME="${PANTS_HOME:-${HOME}/.cache/pants/setup}"
+PANTS_BOOTSTRAP="${PANTS_HOME}/bootstrap"
+
+VENV_VERSION=13.1.0
+
+VENV_PACKAGE=virtualenv-${VENV_VERSION}
+VENV_TARBALL=${VENV_PACKAGE}.tar.gz
+
+# The high-level flow:
+# 1.) Grab pants version from pants.ini or default to latest.
+# 2.) Check for a venv via a naming/path convention and execute if found.
+# 3.) Otherwise create venv and re-exec self.
 #
-# Wrapper script for self-bootstrapping pants.
-set -e
-
-HERE=$(cd `dirname "${BASH_SOURCE[0]}"` && pwd)
-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" ] || \
-    [[ $(< "$HERE/build-support/pants.venv/BOOTSTRAPPED") != $PANTS_VERSION ]]; then
-
-  echo Bootstrapping pants @ $PANTS_VERSION
-  rm -fr "$HERE/build-support/pants.venv"
-  "$HERE/build-support/virtualenv" "$HERE/build-support/pants.venv"
-  # TODO(ksweeney): remove this hack when https://github.com/pantsbuild/pex/issues/21 is
fixed.
-  rm -fr "$HERE/build-support/pants.venv/local"
-  source "$HERE/build-support/pants.venv/bin/activate"
-  python -m pip install -r "$PANTS_REQUIREMENTS"
-  echo $PANTS_VERSION > "$HERE/build-support/pants.venv/BOOTSTRAPPED"
-fi
-source "$HERE/build-support/pants.venv/bin/activate"
-exec pants "$@"
+# After that pants itself will handle making sure any requested plugins
+# are installed and up to date.
+
+function tempdir {
+  mktemp -d "$1"/pants.XXXXXX
+}
+
+# TODO(John Sirois): GC race loser tmp dirs leftover from bootstrap_XXX
+# functions.  Any tmp dir w/o a symlink pointing to it can go.
+
+function bootstrap_venv {
+  if [[ ! -d "${PANTS_BOOTSTRAP}/${VENV_PACKAGE}" ]]
+  then
+    (
+      mkdir -p "${PANTS_BOOTSTRAP}" && \
+      staging_dir=$(tempdir "${PANTS_BOOTSTRAP}") && \
+      cd ${staging_dir} && \
+      curl -O https://pypi.python.org/packages/source/v/virtualenv/${VENV_TARBALL} &&
\
+      tar -xzf ${VENV_TARBALL} && \
+      ln -s "${staging_dir}/${VENV_PACKAGE}" "${staging_dir}/latest" && \
+      mv "${staging_dir}/latest" "${PANTS_BOOTSTRAP}/${VENV_PACKAGE}"
+    ) 1>&2
+  fi
+  echo "${PANTS_BOOTSTRAP}/${VENV_PACKAGE}"
+}
+
+function bootstrap_pants {
+  pants_requirement="pantsbuild.pants"
+  pants_version=$(
+    grep -E "^[[:space:]]*pants_version" pants.ini 2>/dev/null | \
+      sed -E 's|^[[:space:]]*pants_version[:=][[:space:]]*([^[:space:]]+)|\1|'
+  )
+  if [[ -n "${pants_version}" ]]
+  then
+    pants_requirement="${pants_requirement}==${pants_version}"
+  else
+    pants_version="unspecified"
+  fi
+
+  if [[ ! -d "${PANTS_BOOTSTRAP}/${pants_version}" ]]
+  then
+    (
+      venv_path="$(bootstrap_venv)" && \
+      staging_dir=$(tempdir "${PANTS_BOOTSTRAP}") && \
+      "${PYTHON}" "${venv_path}/virtualenv.py" "${staging_dir}/install" && \
+      source "${staging_dir}/install/bin/activate" && \
+      pip install "${pants_requirement}" && \
+      ln -s "${staging_dir}/install" "${staging_dir}/${pants_version}" && \
+      mv "${staging_dir}/${pants_version}" "${PANTS_BOOTSTRAP}/${pants_version}"
+    ) 1>&2
+  fi
+  echo "${PANTS_BOOTSTRAP}/${pants_version}"
+}
+
+pants_dir=$(bootstrap_pants) && \
+exec "${pants_dir}/bin/pants" "$@"

http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/pants.ini
----------------------------------------------------------------------
diff --git a/pants.ini b/pants.ini
index dd4ba66..0bd8ec8 100644
--- a/pants.ini
+++ b/pants.ini
@@ -10,78 +10,18 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
-# pants_workdir, pants_supportdir, pants_distdir, buildroot, homedir and user
-# are seeded in the config
 
 [DEFAULT]
-# Look for these rcfiles - they need not exist on the system
-rcfiles: ['/etc/pantsrc', '~/.pants.new.rc']
-
-pants_cachedir: %(homedir)s/.pants.d
-
-pants_support_baseurls = [
-    'https://dl.bintray.com/pantsbuild/bin/build-support',
-  ]
-pants_support_fetch_timeout_secs: 30
-
-pants_pythons: %(buildroot)s/.python
-confs: ['default']
-max_subprocess_args: 100
-
-thrift_workdir: %(pants_workdir)s/thrift
-
-outdir: %(pants_distdir)s
-
-[goals]
-bootstrap_buildfiles: [
-    # This will pick up the whole top level BUILD file family, including BUILD.commons
-    '%(buildroot)s/BUILD',
-  ]
-
-
-[gen.thrift]
-workdir: %(thrift_workdir)s
-supportdir: bin/thrift
-strict: False
-verbose: False
-version: 0.5.0-finagle
-java: {
-    'gen': 'java:hashcode',
-    'deps': {
-      'service': ['3rdparty:thrift-0.5.0-finagle'],
-      'structs': ['3rdparty:thrift-0.5.0']
-    }
-  }
-python: {
-    'gen': 'py:new_style',
-    'deps': {
-      'service': ['3rdparty/python:thrift'],
-      'structs': ['3rdparty/python:thrift']
-    }
-  }
+pants_version: 0.0.57
 
 
-[idea]
-workdir: %(pants_workdir)s/ide
-classes_conf: default
-sources_conf: sources
-extra_jvm_source_paths = []
-extra_jvm_test_paths = ['src/test/resources']
-python_source_paths: ['src/main/python']
-python_test_paths: ['src/test/python']
-python_lib_paths: []
+[thrift-binary]
+# Pants 0.0.57 defaults to 0.9.2, we want to stay pinned down to 0.9.1 for now.
+version: 0.9.1
 
 
 [python-setup]
-artifact_cache: %(pants_workdir)s/python/artifacts
-bootstrap_cache: %(pants_workdir)s/python/pip
-download_cache: %(pants_workdir)s/python/downloads
-install_cache: %(pants_workdir)s/python/eggs
-interpreter_cache: %(pants_workdir)s/python/interpreters
 interpreter_requirement: CPython>=2.7,<3
-platforms: ['current']
-setuptools_version: 2.2
 
 
 [python-repos]

http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/src/main/python/apache/aurora/client/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/BUILD b/src/main/python/apache/aurora/client/BUILD
index 8424237..1411765 100644
--- a/src/main/python/apache/aurora/client/BUILD
+++ b/src/main/python/apache/aurora/client/BUILD
@@ -29,10 +29,10 @@ python_library(
     '3rdparty/python:twitter.common.zookeeper',
     'api/src/main/thrift/org/apache/aurora/gen',
     'src/main/python/apache/aurora/common',
+    'src/main/python/apache/aurora/client/cli:auroraversion',
     'src/main/python/apache/aurora/config',
     'src/main/python/apache/thermos/common',
     'src/main/python/apache/thermos/config',
-    'src/main/resources/apache/aurora/client/cli:auroraversion',
   ],
 )
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/src/main/python/apache/aurora/client/cli/.auroraversion
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/.auroraversion b/src/main/python/apache/aurora/client/cli/.auroraversion
new file mode 120000
index 0000000..51351a7
--- /dev/null
+++ b/src/main/python/apache/aurora/client/cli/.auroraversion
@@ -0,0 +1 @@
+../../../../../../../.auroraversion
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/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
new file mode 100644
index 0000000..80a6dec
--- /dev/null
+++ b/src/main/python/apache/aurora/client/cli/BUILD
@@ -0,0 +1,18 @@
+#
+# 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+python_library(
+  name = 'auroraversion',
+  resources = [ '.auroraversion' ]
+)

http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/src/main/python/apache/aurora/tools/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/tools/BUILD b/src/main/python/apache/aurora/tools/BUILD
index e5ac758..6717f92 100644
--- a/src/main/python/apache/aurora/tools/BUILD
+++ b/src/main/python/apache/aurora/tools/BUILD
@@ -19,7 +19,7 @@ OBSERVER_SOURCE = 'thermos_observer.py'
 
 python_library(
   name = '_tools',
-  sources = rglobs('*.py') - [THERMOS_SOURCE] - [OBSERVER_SOURCE],
+  sources = rglobs('*.py', exclude=[[THERMOS_SOURCE], [OBSERVER_SOURCE]]),
   dependencies = [
     '3rdparty/python:CherryPy',
     '3rdparty/python:twitter.common.app',

http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/src/main/python/apache/thermos/observer/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/observer/BUILD b/src/main/python/apache/thermos/observer/BUILD
index d7eedab..95b8dcd 100644
--- a/src/main/python/apache/thermos/observer/BUILD
+++ b/src/main/python/apache/thermos/observer/BUILD
@@ -18,7 +18,7 @@ import os
 python_library(
   name = 'observer',
   sources = rglobs('*.py'),
-  resources = zglobs('**/assets/*') + rglobs('*.tpl'),
+  resources = zglobs('**/assets/*', '**/*.tpl'),
   dependencies = [
     '3rdparty/python:bottle',
     '3rdparty/python:mako',

http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/src/main/resources/apache/aurora/client/cli/.auroraversion
----------------------------------------------------------------------
diff --git a/src/main/resources/apache/aurora/client/cli/.auroraversion b/src/main/resources/apache/aurora/client/cli/.auroraversion
deleted file mode 100644
index 67ff1ac..0000000
--- a/src/main/resources/apache/aurora/client/cli/.auroraversion
+++ /dev/null
@@ -1 +0,0 @@
-0.11.0-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/aurora/blob/872aa79d/src/main/resources/apache/aurora/client/cli/BUILD
----------------------------------------------------------------------
diff --git a/src/main/resources/apache/aurora/client/cli/BUILD b/src/main/resources/apache/aurora/client/cli/BUILD
deleted file mode 100644
index 7c77d10..0000000
--- a/src/main/resources/apache/aurora/client/cli/BUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# 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
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-python_library(
-  name = 'auroraversion',
-  resources = [ '.auroraversion' ]
-)
\ No newline at end of file


Mime
View raw message