Change gcloud package to google.cloud

.coveragerc

@@ -1,13 +1,13 @@
 [run]
 branch = True
 
-[report]
-fail_under = 100
-show_missing = True
-
 [report]
 omit =
  */_generated/*.py
+ # Packages in the "google.cloud" package that we don't own.
+ */google/cloud/logging/v2/*
+ */google/cloud/pubsub/v1/*
+fail_under = 100
 show_missing = True
 exclude_lines =
  # Re-enable the standard pragma

.travis.yml

@@ -13,7 +13,6 @@ script:
  - tox -e system-tests
  - tox -e system-tests3
  - tox -e docs
- - tox -e json-docs
 
 after_success:
  - tox -e coveralls
@@ -25,7 +24,7 @@ deploy:
  secure: keSFPLzVj/yAAJ8kw4m+U5kpIiGqubpDqhcHPlGAvMohFMIO4D8ffgCqJdbhQshTtb/wiS5ajK1KNpEzq4BKD/5oRXuj/sIRTMENzX/azUXkT/bADLEGocyfE4/NAGQ9mcDOmHntjt7UUhYN6H87rgex22er4V1vD5tGf5Kc1HU=
  on:
  tags: true
- repo: GoogleCloudPlatform/gcloud-python
+ repo: GoogleCloudPlatform/google-cloud-python
  # until this is fixed: https://github.com/travis-ci/travis-ci/issues/1675
  all_branches: true
  # 'bdist_wheel' builds disabled until #1879 et al. are resolved.

CONTRIBUTING.rst

@@ -6,42 +6,42 @@ Contributing
 #. Make sure that your commit messages clearly describe the changes.
 #. Send a pull request.
 
-Here are some guidelines for hacking on ``gcloud-python``.
+Here are some guidelines for hacking on ``google-cloud-python``.
 
 Using a Development Checkout
 ----------------------------
 
-You'll have to create a development environment to hack on ``gcloud-python``,
+You'll have to create a development environment to hack on ``google-cloud-python``,
 using a Git checkout:
 
-- While logged into your GitHub account, navigate to the ``gcloud-python`` repo
+- While logged into your GitHub account, navigate to the ``google-cloud-python`` repo
  on GitHub.
 
- https://github.com/GoogleCloudPlatform/gcloud-python
+ https://github.com/GoogleCloudPlatform/google-cloud-python
 
-- Fork and clone the ``gcloud-python`` repository to your GitHub account by
+- Fork and clone the ``google-cloud-python`` repository to your GitHub account by
  clicking the "Fork" button.
 
-- Clone your fork of ``gcloud-python`` from your GitHub account to your local
+- Clone your fork of ``google-cloud-python`` from your GitHub account to your local
  computer, substituting your account username and specifying the destination
- as "hack-on-gcloud". E.g.::
+ as "hack-on-google-cloud-python". E.g.::
 
  $ cd ~
- $ git clone git@github.com:USERNAME/gcloud-python.git hack-on-gcloud
- $ cd hack-on-gcloud
- # Configure remotes such that you can pull changes from the gcloud-python
+ $ git clone git@github.com:USERNAME/google-cloud-python.git hack-on-google-cloud-python
+ $ cd hack-on-google-cloud-python
+ # Configure remotes such that you can pull changes from the google-cloud-python
  # repository into your local repository.
- $ git remote add upstream https://github.com:GoogleCloudPlatform/gcloud-python
+ $ git remote add upstream https://github.com:GoogleCloudPlatform/google-cloud-python
  # fetch and merge changes from upstream into master
  $ git fetch upstream
  $ git merge upstream/master
 
 Now your local repo is set up such that you will push changes to your GitHub
 repo, from which you can submit a pull request.
 
-- Create a virtualenv in which to install ``gcloud-python``::
+- Create a virtualenv in which to install ``google-cloud-python``::
 
- $ cd ~/hack-on-gcloud
+ $ cd ~/hack-on-google-cloud-python
  $ virtualenv --python python2.7 env
 
  Note that very old versions of virtualenv (virtualenv versions below, say,
@@ -52,16 +52,16 @@ repo, from which you can submit a pull request.
  flag to ``virtualenv``. For example, ``virtualenv --python python2.7``
  chooses the Python 2.7 interpreter to be installed.
 
- From here on in within these instructions, the ``~/hack-on-gcloud/env``
+ From here on in within these instructions, the ``~/hack-on-google-cloud-python/env``
  virtual environment you created above will be referred to as ``$VENV``.
  To use the instructions in the steps that follow literally, use the
- ``export VENV=~/hack-on-gcloud/env`` command.
+ ``export VENV=~/hack-on-google-cloud-python/env`` command.
 
-- Install ``gcloud-python`` from the checkout into the virtualenv using
+- Install ``google-cloud-python`` from the checkout into the virtualenv using
  ``setup.py develop``. Running ``setup.py develop`` *must* be done while
- the current working directory is the ``gcloud-python`` checkout directory::
+ the current working directory is the ``google-cloud-python`` checkout directory::
 
- $ cd ~/hack-on-gcloud
+ $ cd ~/hack-on-google-cloud-python
  $ $VENV/bin/python setup.py develop
 
 I'm getting weird errors... Can you help?
@@ -76,7 +76,7 @@ On Debian/Ubuntu::
 Adding Features
 ---------------
 
-In order to add a feature to ``gcloud-python``:
+In order to add a feature to ``google-cloud-python``:
 
 - The feature must be documented in both the API and narrative
  documentation (in ``docs/``).
@@ -100,11 +100,11 @@ Coding Style
 - In order to make ``tox -e lint`` run faster, you can set some environment
  variables::
 
- export GCLOUD_REMOTE_FOR_LINT="upstream"
- export GCLOUD_BRANCH_FOR_LINT="master"
+ export GOOGLE_CLOUD_REMOTE_FOR_LINT="upstream"
+ export GOOGLE_CLOUD_BRANCH_FOR_LINT="master"
 
  By doing this, you are specifying the location of the most up-to-date
- version of ``gcloud-python``. The the suggested remote name ``upstream``
+ version of ``google-cloud-python``. The the suggested remote name ``upstream``
  should point to the official ``GoogleCloudPlatform`` checkout and the
  the branch should be the main branch on that remote (``master``).
 
@@ -117,21 +117,21 @@ Exceptions to PEP8:
 Running Tests
 --------------
 
-- To run all tests for ``gcloud-python`` on a single Python version, run
+- To run all tests for ``google-cloud-python`` on a single Python version, run
  ``py.test`` from your development virtualenv (See
  *Using a Development Checkout* above).
 
-- To run the full set of ``gcloud-python`` tests on all platforms, install
+- To run the full set of ``google-cloud-python`` tests on all platforms, install
  ``tox`` (https://testrun.org/tox/) into a system Python. The ``tox`` console
  script will be installed into the scripts location for that Python. While
- ``cd``'ed to the ``gcloud-python`` checkout root directory (it contains
+ ``cd``'ed to the ``google-cloud-python`` checkout root directory (it contains
  ``tox.ini``), invoke the ``tox`` console script. This will read the
  ``tox.ini`` file and execute the tests on multiple Python versions and
  platforms; while it runs, it creates a virtualenv for each version/platform
  combination. For example::
 
  $ sudo /usr/bin/pip install tox
- $ cd ~/hack-on-gcloud/
+ $ cd ~/hack-on-google-cloud-python/
  $ /usr/bin/tox
 
 Running System Tests
@@ -153,7 +153,7 @@ Running System Tests
  so you'll need to provide some environment variables to facilitate
  authentication to your project:
 
- - ``GCLOUD_TESTS_PROJECT_ID``: Developers Console project ID (e.g.
+ - ``GOOGLE_CLOUD_TESTS_PROJECT_ID``: Developers Console project ID (e.g.
  bamboo-shift-455).
  - ``GOOGLE_APPLICATION_CREDENTIALS``: The path to a JSON key file;
  see ``system_tests/app_credentials.json.sample`` as an example. Such a file
@@ -187,7 +187,7 @@ Running System Tests
 
  # Create the indexes
  $ gcloud preview datastore create-indexes system_tests/data/index.yaml \
- > --project=$GCLOUD_TESTS_PROJECT_ID
+ > --project=$GOOGLE_CLOUD_TESTS_PROJECT_ID
 
  # Restore your environment to its previous state.
  $ unset CLOUDSDK_PYTHON_SITEPACKAGES
@@ -223,14 +223,14 @@ Running System Tests
  $ gcloud beta emulators datastore env-init
  export DATASTORE_LOCAL_HOST=localhost:8417
  export DATASTORE_HOST=http://localhost:8417
- export DATASTORE_DATASET=gcloud-settings-app-id
- export DATASTORE_PROJECT_ID=gcloud-settings-app-id
+ export DATASTORE_DATASET=google-cloud-settings-app-id
+ export DATASTORE_PROJECT_ID=google-cloud-settings-app-id
 
  using these environment variables run the emulator::
 
  $ DATASTORE_HOST=http://localhost:8471 \
- > DATASTORE_DATASET=gcloud-settings-app-id \
- > GCLOUD_NO_PRINT=true \
+ > DATASTORE_DATASET=google-cloud-settings-app-id \
+ > GOOGLE_CLOUD_NO_PRINT=true \
  > python system_tests/run_system_test.py \
  > --package=datastore --ignore-requirements
 
@@ -283,22 +283,22 @@ changed to reflect the bug fix, ideally in the same commit that fixes the bug
 or adds the feature.
 
 To build and review docs (where ``$VENV`` refers to the virtualenv you're
-using to develop ``gcloud-python``):
+using to develop ``google-cloud-python``):
 
 1. After following the steps above in "Using a Development Checkout", install
  Sphinx and all development requirements in your virtualenv::
 
- $ cd ~/hack-on-gcloud
+ $ cd ~/hack-on-google-cloud-python
  $ $VENV/bin/pip install Sphinx
 
-2. Change into the ``docs`` directory within your ``gcloud-python`` checkout and
+2. Change into the ``docs`` directory within your ``google-cloud-python`` checkout and
  execute the ``make`` command with some flags::
 
- $ cd ~/hack-on-gcloud/gcloud-python/docs
+ $ cd ~/hack-on-google-cloud-python/google-cloud-python/docs
  $ make clean html SPHINXBUILD=$VENV/bin/sphinx-build
 
  The ``SPHINXBUILD=...`` argument tells Sphinx to use the virtualenv Python,
- which will have both Sphinx and ``gcloud-python`` (for API documentation
+ which will have both Sphinx and ``google-cloud-python`` (for API documentation
  generation) installed.
 
 3. Open the ``docs/_build/html/index.html`` file to see the resulting HTML
@@ -314,7 +314,7 @@ build via::
 
  $ tox -e docs-rtd
 
-.. _readthedocs: http://gcloud-python.readthedocs.org/
+.. _readthedocs: http://google-cloud-python.readthedocs.org/
 
 Note About ``README`` as it pertains to PyPI
 --------------------------------------------
@@ -323,10 +323,10 @@ The `description on PyPI`_ for the project comes directly from the
 ``README``. Due to the reStructuredText (``rst``) parser used by
 PyPI, relative links which will work on GitHub (e.g. ``CONTRIBUTING.rst``
 instead of
-``https://github.com/GoogleCloudPlatform/gcloud-python/blob/master/CONTRIBUTING.rst``)
+``https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/CONTRIBUTING.rst``)
 may cause problems creating links or rendering the description.
 
-.. _description on PyPI: https://pypi.python.org/pypi/gcloud
+.. _description on PyPI: https://pypi.python.org/pypi/google-cloud
 
 Travis Configuration and Build Optimizations
 --------------------------------------------
@@ -364,7 +364,7 @@ We support:
 
 Supported versions can be found in our ``tox.ini`` `config`_.
 
-.. _config: https://github.com/GoogleCloudPlatform/gcloud-python/blob/master/tox.ini
+.. _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`_.
@@ -387,7 +387,7 @@ We also explicitly decided to support Python 3 beginning with version
 .. _prominent: https://docs.djangoproject.com/en/1.9/faq/install/#what-python-version-can-i-use-with-django
 .. _projects: http://flask.pocoo.org/docs/0.10/python3/
 .. _Unicode literal support: https://www.python.org/dev/peps/pep-0414/
-.. _dropped 2.6: https://github.com/GoogleCloudPlatform/gcloud-python/issues/995
+.. _dropped 2.6: https://github.com/GoogleCloudPlatform/google-cloud-python/issues/995
 
 Versioning
 ----------

MANIFEST.in

@@ -1,3 +1,3 @@
 include README.rst
-graft gcloud
+graft google
 global-exclude *.pyc

Makefile.bigtable_v2

@@ -1,12 +1,12 @@
 GRPCIO_VIRTUALENV=$(shell pwd)/grpc_python_venv
 GENERATED_DIR=$(shell pwd)/generated_python
 GENERATED_SUBDIR=_generated
-BIGTABLE_DIR=$(shell pwd)/gcloud/bigtable/$(GENERATED_SUBDIR)
+BIGTABLE_DIR=$(shell pwd)/google/cloud/bigtable/$(GENERATED_SUBDIR)
 PROTOC_CMD=$(GRPCIO_VIRTUALENV)/bin/python -m grpc.tools.protoc
 GOOGLEAPIS_PROTOS_DIR=$(shell pwd)/googleapis-pb
 
 help:
-	@echo 'Makefile for gcloud-python Bigtable protos '
+	@echo 'Makefile for google-cloud-python Bigtable protos '
 	@echo ' '
 	@echo ' make generate Generates the protobuf modules '
 	@echo ' make clean Clean generated files '

Makefile.datastore

@@ -1,11 +1,11 @@
 GRPCIO_VIRTUALENV=$(shell pwd)/grpc_python_venv
 GENERATED_DIR=$(shell pwd)/generated_python
-DATASTORE_DIR=$(shell pwd)/gcloud/datastore/_generated
+DATASTORE_DIR=$(shell pwd)/google/cloud/datastore/_generated
 PROTOC_CMD=$(GRPCIO_VIRTUALENV)/bin/python -m grpc.tools.protoc
 GOOGLEAPIS_PROTOS_DIR=$(shell pwd)/googleapis-pb
 
 help:
-	@echo 'Makefile for gcloud-python Bigtable protos '
+	@echo 'Makefile for google-cloud-python Bigtable protos '
 	@echo ' '
 	@echo ' make generate Generates the protobuf modules '
 	@echo ' make clean Clean generated files '