Cleaning up remaining renames of gcloud->google-cloud.

daspecster · Sep 6, 2016 · 5910b22 · 5910b22
1 parent faab61c
commit 5910b22
Show file tree

Hide file tree

Showing 46 changed files with 85 additions and 81 deletions.
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -223,13 +223,13 @@ 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 \
+   >   DATASTORE_DATASET=google-cloud-settings-app-id \
    >   GOOGLE_CLOUD_NO_PRINT=true \
    >   python system_tests/run_system_test.py \
    >   --package=datastore --ignore-requirements
@@ -326,7 +326,7 @@ instead of
 ``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
 --------------------------------------------

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,3 @@
 include README.rst
-graft gcloud
+graft google
 global-exclude *.pyc
diff --git a/Makefile.bigtable_v2 b/Makefile.bigtable_v2
@@ -1,7 +1,7 @@
 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
 

diff --git a/Makefile.datastore b/Makefile.datastore
@@ -1,6 +1,6 @@
 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
 

diff --git a/README.rst b/README.rst
@@ -11,7 +11,7 @@ Google Cloud Python Client
 -  `API Documentation`_
 
 .. _Homepage: https://googlecloudplatform.github.io/google-cloud-python/
-.. _API Documentation: http://googlecloudplatform.github.io/google-cloud-python/#/docs/master/gcloud
+.. _API Documentation: http://googlecloudplatform.github.io/google-cloud-python/#/docs/master/google-cloud
 
 This client supports the following Google Cloud Platform services:
 
@@ -41,7 +41,7 @@ Quick Start
 
 ::
 
-    $ pip install --upgrade gcloud
+    $ pip install --upgrade google-cloud
 
 Example Applications
 --------------------
@@ -58,8 +58,8 @@ Authentication
 
 With ``google-cloud-python`` we try to make authentication as painless as possible.
 Check out the `Authentication section`_ in our documentation to learn more.
-You may also find the `authentication document`_ shared by all the ``gcloud-*``
-libraries to be helpful.
+You may also find the `authentication document`_ shared by all the
+``google-cloud-*`` libraries to be helpful.
 
 .. _Authentication section: http://google-cloud-python.readthedocs.org/en/latest/gcloud-auth.html
 .. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication
@@ -328,7 +328,7 @@ Apache 2.0 - See `LICENSE`_ for more information.
    :target: https://travis-ci.org/GoogleCloudPlatform/google-cloud-python
 .. |coverage| image:: https://coveralls.io/repos/GoogleCloudPlatform/google-cloud-python/badge.png?branch=master
    :target: https://coveralls.io/r/GoogleCloudPlatform/google-cloud-python?branch=master
-.. |pypi| image:: https://img.shields.io/pypi/v/gcloud.svg
-   :target: https://pypi.python.org/pypi/gcloud
-.. |versions| image:: https://img.shields.io/pypi/pyversions/gcloud.svg
-   :target: https://pypi.python.org/pypi/gcloud
+.. |pypi| image:: https://img.shields.io/pypi/v/google-cloud.svg
+   :target: https://pypi.python.org/pypi/google-cloud
+.. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud.svg
+   :target: https://pypi.python.org/pypi/google-cloud
diff --git a/docs/Makefile b/docs/Makefile
@@ -77,17 +77,17 @@ qthelp:
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/gclouddatastore.qhcp"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/google-cloud.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/gclouddatastore.qhc"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/google-cloud.qhc"
 
 devhelp:
 	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
 	@echo
 	@echo "Build finished."
 	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/gclouddatastore"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/gclouddatastore"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/google-cloud"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/google-cloud"
 	@echo "# devhelp"
 
 epub:

diff --git a/docs/gcloud-auth.rst b/docs/gcloud-auth.rst
@@ -22,7 +22,9 @@ Overview
 
         $ gcloud auth login
 
-    Previously, `gcloud auth login` was used for both use cases. If your gcloud installation does not support the new command, please update it:
+    Previously, ``gcloud auth login`` was used for both use cases. If
+    your ``gcloud`` installation does not support the new command,
+    please update it:
 
     .. code-block:: bash
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -1,7 +1,7 @@
 .. toctree::
   :maxdepth: 0
   :hidden:
-  :caption: gcloud
+  :caption: google-cloud
 
   gcloud-api
   gcloud-config
@@ -170,16 +170,16 @@
   GitHub <https://github.com/GoogleCloudPlatform/google-cloud-python/>
   Issues <https://github.com/GoogleCloudPlatform/google-cloud-python/issues>
   Stack Overflow <http://stackoverflow.com/questions/tagged/google-cloud-python>
-  PyPI <https://pypi.python.org/pypi/gcloud>
+  PyPI <https://pypi.python.org/pypi/google-cloud>
 
 Getting started
 ---------------
 
-The ``gcloud`` library is ``pip`` install-able:
+The ``google-cloud`` library is ``pip`` install-able:
 
 .. code-block:: console
 
-    $ pip install gcloud
+    $ pip install google-cloud
 
 If you want to install ``google-cloud-python`` from source,
 you can clone the repository from GitHub:

diff --git a/docs/json/json/home.html b/docs/json/json/home.html
@@ -9,7 +9,7 @@ <h1>google-cloud-python</h1>
     </div>
 
     <div class="quote-box--supplementary">
-      <pre class="skip-highlight"><code class="subtle--blue">$</code> pip install <code class="subtle--blue">--upgrade</code> <strong>gcloud</strong></pre>
+      <pre class="skip-highlight"><code class="subtle--blue">$</code> pip install <code class="subtle--blue">--upgrade</code> <strong>google-cloud</strong></pre>
       <h4 class="latest-release subtle" ng-if="home.latestRelease">
         Latest Release <a ng-href="{{home.latestRelease.link}}" class="latest-release--link white">{{home.latestRelease.name}}</a>
         {{home.latestRelease.date|date}}
@@ -22,7 +22,7 @@ <h4 class="latest-release subtle" ng-if="home.latestRelease">
   <div class="container">
     <ul class="featuring-links">
       <li>
-        <a href="#/docs/{{home.latestRelease.name}}/gcloud" title="google-cloud-python docs" class="btn btn-docs">
+        <a href="#/docs/{{home.latestRelease.name}}/google-cloud" title="google-cloud-python docs" class="btn btn-docs">
           <img src="src/images/icon-lang-python-gray.svg" alt="Python icon" />
           Read the Docs
         </a>
@@ -46,7 +46,7 @@ <h4 class="latest-release subtle" ng-if="home.latestRelease">
         </a>
       </li>
       <li>
-        <a href="https://pypi.python.org/pypi/gcloud" title="google-cloud-python on pypi" class="ext-link">
+        <a href="https://pypi.python.org/pypi/google-cloud" title="google-cloud-python on pypi" class="ext-link">
           <img src="src/images/icon-link-package-manager.svg" alt="pypi icon" />
           PyPI
         </a>
@@ -105,11 +105,11 @@ <h3 class="block-title">Examples</h3>
     <h3 class="block-title">FAQ</h3>
 
     <h4>What is the relationship between the <code>google-cloud-python</code> package
-    and the <code>gcloud</code> command-line tool?</h4>
-    <p>Both the <code>gcloud</code> command-line tool and
+    and the <code>google-cloud</code> command-line tool?</h4>
+    <p>Both the <code>google-cloud</code> command-line tool and
     <code>google-cloud-python</code> package are a part of the Google Cloud SDK: a collection
     of tools and libraries that enable you to easily create and manage
-    resources on the Google Cloud Platform. The <code>gcloud</code> command-line
+    resources on the Google Cloud Platform. The <code>google-cloud</code> command-line
     tool can be used to manage both your development workflow and your
     Google Cloud Platform resources while the <code>google-cloud-python</code> package is the
     Google Cloud Client Library for Python.</p>

diff --git a/docs/json/json/master/index.json b/docs/json/json/master/index.json
@@ -1,10 +1,10 @@
 {
-  "description": "<div class=\"section\"><h2><code>google-cloud-python</code></h2><p>GCloud API access in idiomatic Python.</p></div>",
+  "description": "<div class=\"section\"><h2><code>google-cloud-python</code></h2><p>Google Cloud API access in idiomatic Python.</p></div>",
   "examples": [
     "import google.cloud"
   ],
-  "id": "gcloud.__init__",
+  "id": "google.cloud.__init__",
   "methods": [],
   "name": "__Init__",
-  "source": "/gcloud/__init__.py"
+  "source": "/google/cloud/__init__.py"
 }
diff --git a/docs/json/json/master/overview.html b/docs/json/json/master/overview.html
@@ -1,11 +1,11 @@
 <h2>Getting started</h2>
 
 <p>
-The <code>gcloud</code> library is <code>pip</code> install-able:
+The <code>google-cloud</code> library is <code>pip</code> install-able:
 </p>
 
 <div hljs>
-    $ pip install gcloud
+    $ pip install google-cloud
 </div>
 
 <p>

diff --git a/docs/json/manifest.json b/docs/json/manifest.json
@@ -10,7 +10,7 @@
   },
   "markdown": "python",
   "package": {
-    "href": "https://pypi.python.org/pypi/gcloud",
+    "href": "https://pypi.python.org/pypi/google-cloud",
     "title": "PyPI"
   },
   "titleDelimiter": ".",

diff --git a/docs/logging-usage.rst b/docs/logging-usage.rst
@@ -397,7 +397,7 @@ Logging client.
     >>> import logging
     >>> import google.cloud.logging # Don't conflict with standard logging
     >>> from google.cloud.logging.handlers import CloudLoggingHandler
-    >>> client = gcloud.logging.Client()
+    >>> client = google.cloud.logging.Client()
     >>> handler = CloudLoggingHandler(client)
     >>> cloud_logger = logging.getLogger('cloudLogger')
     >>> cloud_logger.setLevel(logging.INFO) # defaults to WARN
@@ -429,7 +429,7 @@ this automatically:
     >>> import logging
     >>> import google.cloud.logging # Don't conflict with standard logging
     >>> from google.cloud.logging.handlers import CloudLoggingHandler, setup_logging
-    >>> client = gcloud.logging.Client()
+    >>> client = google.cloud.logging.Client()
     >>> handler = CloudLoggingHandler(client)
     >>> logging.getLogger().setLevel(logging.INFO) # defaults to WARN
     >>> setup_logging(handler)

diff --git a/google/cloud/__init__.py b/google/cloud/__init__.py
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""GCloud API access in idiomatic Python."""
+"""Google Cloud API access in idiomatic Python."""
 
 from pkg_resources import get_distribution
 
-__version__ = get_distribution('gcloud').version
+__version__ = get_distribution('google-cloud').version
diff --git a/google/cloud/_helpers.py b/google/cloud/_helpers.py
@@ -11,9 +11,10 @@
 # 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.
-"""Thread-local resource stack.
 
-This module is not part of the public API surface of `gcloud`.
+"""Shared helpers for Google Cloud packages.
+
+This module is not part of the public API surface.
 """
 
 import calendar

diff --git a/google/cloud/bigquery/connection.py b/google/cloud/bigquery/connection.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Create / interact with gcloud bigquery connections."""
+"""Create / interact with Google Cloud BigQuery connections."""
 
 from google.cloud import connection as base_connection
 

diff --git a/google/cloud/bigtable/client.py b/google/cloud/bigtable/client.py
@@ -68,7 +68,7 @@
 """Scope for reading table data."""
 
 DEFAULT_USER_AGENT = 'google-cloud-python/{0}'.format(
-    get_distribution('gcloud').version)
+    get_distribution('google-cloud').version)
 """The default user agent for API requests."""
 
 

diff --git a/google/cloud/connection.py b/google/cloud/connection.py
@@ -63,7 +63,8 @@ class Connection(object):
     :param http: An optional HTTP object to make requests.
     """
 
-    USER_AGENT = "google-cloud-python/{0}".format(get_distribution('gcloud').version)
+    USER_AGENT = "google-cloud-python/{0}".format(
+        get_distribution('google-cloud').version)
     """The user agent for google-cloud-python requests."""
 
     SCOPE = None

diff --git a/google/cloud/datastore/connection.py b/google/cloud/datastore/connection.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Connections to gcloud datastore API servers."""
+"""Connections to Google Cloud Datastore API servers."""
 
 import os
 

diff --git a/google/cloud/datastore/entity.py b/google/cloud/datastore/entity.py
@@ -82,7 +82,7 @@ def __init__(self, key=None, exclude_from_indexes=()):
         self._exclude_from_indexes = set(_ensure_tuple_or_list(
             'exclude_from_indexes', exclude_from_indexes))
         # NOTE: This will be populated when parsing a protobuf in
-        #       gcloud.datastore.helpers.entity_from_protobuf.
+        #       google.cloud.datastore.helpers.entity_from_protobuf.
         self._meanings = {}
 
     def __eq__(self, other):

diff --git a/google/cloud/datastore/key.py b/google/cloud/datastore/key.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Create / interact with gcloud datastore keys."""
+"""Create / interact with Google Cloud Datastore keys."""
 
 import copy
 import six

diff --git a/google/cloud/datastore/query.py b/google/cloud/datastore/query.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Create / interact with gcloud datastore queries."""
+"""Create / interact with Google Cloud Datastore queries."""
 
 import base64
 

diff --git a/google/cloud/datastore/transaction.py b/google/cloud/datastore/transaction.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Create / interact with gcloud datastore transactions."""
+"""Create / interact with Google Cloud Datastore transactions."""
 
 from google.cloud.datastore.batch import Batch
 

diff --git a/google/cloud/dns/connection.py b/google/cloud/dns/connection.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Create / interact with gcloud dns connections."""
+"""Create / interact with Google Cloud DNS connections."""
 
 from google.cloud import connection as base_connection
 

diff --git a/google/cloud/environment_vars.py b/google/cloud/environment_vars.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Comprehensive list of environment variables used in gcloud.
+"""Comprehensive list of environment variables used in google-cloud.
 
 These enable many types of implicit behavior in both production
 and tests.

diff --git a/google/cloud/error_reporting/client.py b/google/cloud/error_reporting/client.py
@@ -105,7 +105,7 @@ def __init__(self, project=None,
                  http=None,
                  service=None,
                  version=None):
-        self.logging_client = gcloud.logging.client.Client(
+        self.logging_client = google.cloud.logging.client.Client(
             project, credentials, http)
         self.service = service if service else self.DEFAULT_SERVICE
         self.version = version

diff --git a/google/cloud/exceptions.py b/google/cloud/exceptions.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Custom exceptions for :mod:`gcloud` package.
+"""Custom exceptions for :mod:`google.cloud` package.
 
 See: https://cloud.google.com/storage/docs/json_api/v1/status-codes
 """
@@ -25,7 +25,7 @@
 
 
 class GoogleCloudError(Exception):
-    """Base error class for gcloud errors (abstract).
+    """Base error class for Google Cloud errors (abstract).
 
     Each subclass represents a single type of HTTP error response.
     """