Merge pull request #1350 from dhermes/use-travis-caching

Removing use of wheelhouse and relying on Travis caching.

Author: dhermes

.gitignore

@@ -50,9 +50,6 @@ system_tests/local_test_setup
 # Make sure a generated file isn't accidentally committed.
 pylintrc_reduced
 
-# Travis build directories.
-gcloud-python-wheels/
-
 # Directories used for creating generated PB2 files
 generated_python/
 cloud-bigtable-client/

.travis.yml

@@ -1,13 +1,9 @@
 language: python
 sudo: false
 
-before_install:
-  - git clone https://github.com/GoogleCloudPlatform/gcloud-python-wheels
-        gcloud-python-wheels
-  - export WHEELHOUSE="$(pwd)/gcloud-python-wheels/wheelhouse/"
-
 install:
-  - scripts/custom_pip_install.sh tox
+  - pip install --upgrade pip
+  - pip install --upgrade tox
 
 script:
   - tox -e py26
@@ -32,3 +28,7 @@ deploy:
     # until this is fixed: https://github.com/travis-ci/travis-ci/issues/1675
     all_branches: true
   distributions: "sdist bdist_wheel"
+
+cache:
+  directories:
+    - ${HOME}/.cache/pip

CONTRIBUTING.rst

@@ -283,22 +283,18 @@ Python dependencies are specified in the ``tox.ini`` configuration.
 They are executed in the Travis build via ``tox -e {ENV}`` where
 ``{ENV}`` is the environment being tested.
 
-By enumerating all Python dependencies in the ``tox`` configuration,
-we can use our custom ``gcloud-python-wheels``
-`wheelhouse <https://github.com/GoogleCloudPlatform/gcloud-python-wheels>`__
-to speed up builds. This project builds and stores pre-built Python
-`wheels <http://pythonwheels.com>`__ for every Python dependency our library
-and tests have.
-
 If new ``tox`` environments are added to be run in a Travis build, they
-should either be:
+should be listed in ``[tox].envlist`` as a default environment.
+
+We speed up builds by using the Travis `caching feature`_.
 
-- listed in ``[tox].envlist`` as a default environment
+.. _caching feature: https://docs.travis-ci.com/user/caching/#pip-cache
 
-- added to the list in the
-  `Travis environment variable <http://docs.travis-ci.com/user/environment-variables/#Using-Settings>`__
-  ``EXTRA_TOX_ENVS``. This value is unencrypted in ``gcloud-python-wheels``
-  to make ongoing maintenance easier.
+We intentionally **do not** cache the ``.tox/`` directory. Instead, we
+allow the ``tox`` environments to be re-built for every build. This
+way, we'll always get the latest versions of our dependencies and any
+caching or wheel optimization to be done will be handled automatically
+by ``pip``.
 
 Supported Python Versions
 -------------------------

scripts/custom_pip_install.sh

@@ -21,8 +21,8 @@ set -ev
 ##############################################
 if [[ "${TRAVIS_BRANCH}" == "master" ]] && \
        [[ "${TRAVIS_PULL_REQUEST}" == "false" ]]; then
+  echo "Building new docs on a merged commit."
   scripts/update_docs.sh
-  scripts/update_wheels_project.sh
 elif [[ -n "${TRAVIS_TAG}" ]]; then
   echo "Building new docs on a tag."
   scripts/update_docs.sh

scripts/merge.sh

@@ -3,8 +3,6 @@ envlist =
     py26,py27,py33,py34,cover,docs,lint
 
 [testenv]
-install_command =
-    {toxinidir}/scripts/custom_pip_install.sh {opts} {packages}
 commands =
     nosetests
 deps =