Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -404,22 +404,18 @@ may cause problems creating links or rendering the description.

.. _description on PyPI: https://pypi.python.org/pypi/google-cloud

********************************************
Travis Configuration and Build Optimizations
********************************************
**********************************************
CircleCI Configuration and Build Optimizations
**********************************************

All build scripts in the ``.travis.yml`` configuration file which have
All build scripts in the ``circle.yml`` configuration file which have
Python dependencies are specified in the ``tox.ini`` configuration.
They are executed in the Travis build via ``tox -e ${ENV}`` where
They are executed in the CircleCI build via ``tox -e ${ENV}`` where
``${ENV}`` is the environment being tested.

If new ``tox`` environments are added to be run in a Travis build, they
If new ``tox`` environments are added to be run in a CircleCI build, they
should be listed in ``[tox].envlist`` as a default environment.

We speed up builds by using the Travis `caching feature`_.

.. _caching feature: https://docs.travis-ci.com/user/caching/#pip-cache

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
Expand All @@ -445,11 +441,10 @@ Supported versions can be found in our ``tox.ini`` `config`_.
.. _config: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/tox.ini

We explicitly decided not to support `Python 2.5`_ due to `decreased usage`_
and lack of continuous integration `support`_.
and lack of continuous integration support.

.. _Python 2.5: https://docs.python.org/2.5/
.. _decreased usage: https://caremad.io/2013/10/a-look-at-pypi-downloads/
.. _support: https://blog.travis-ci.com/2013-11-18-upcoming-build-environment-updates/

We have `dropped 2.6`_ as a supported version as well since Python 2.6 is no
longer supported by the core development team.
Expand Down
4 changes: 1 addition & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Google Cloud Python Client

.. _Google Cloud Platform: https://cloud.google.com/

|pypi| |circleci| |build| |appveyor| |coverage| |versions|
|pypi| |circleci| |appveyor| |coverage| |versions|

- `Homepage`_
- `API Documentation`_
Expand Down Expand Up @@ -143,8 +143,6 @@ Apache 2.0 - See `LICENSE`_ for more information.

.. _LICENSE: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/LICENSE

.. |build| image:: https://travis-ci.org/GoogleCloudPlatform/google-cloud-python.svg?branch=master
:target: https://travis-ci.org/GoogleCloudPlatform/google-cloud-python
.. |circleci| image:: https://circleci.com/gh/GoogleCloudPlatform/google-cloud-python.svg?style=shield
:target: https://circleci.com/gh/GoogleCloudPlatform/google-cloud-python
.. |appveyor| image:: https://ci.appveyor.com/api/projects/status/github/googlecloudplatform/google-cloud-python?branch=master&svg=true
Expand Down