From 81a4591b2bc4a3c209b64a9057fe320fa78c9f33 Mon Sep 17 00:00:00 2001 From: Jon Wayne Parrott Date: Wed, 18 Oct 2017 12:51:39 -0700 Subject: [PATCH 1/2] Updating docs to use api_core instead of api.core --- docs/core/exceptions.rst | 2 +- docs/core/helpers.rst | 6 +++--- docs/core/operation.rst | 2 +- docs/core/operations_client.rst | 2 +- docs/core/page_iterator.rst | 2 +- docs/core/path_template.rst | 2 +- docs/core/retry.rst | 2 +- docs/core/timeout.rst | 2 +- docs/requirements.txt | 1 + nox.py | 3 +-- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/core/exceptions.rst b/docs/core/exceptions.rst index ed3446cd0b2c..d671f4e02046 100644 --- a/docs/core/exceptions.rst +++ b/docs/core/exceptions.rst @@ -1,6 +1,6 @@ Exceptions ========== -.. automodule:: google.api.core.exceptions +.. automodule:: google.api_core.exceptions :members: :show-inheritance: diff --git a/docs/core/helpers.rst b/docs/core/helpers.rst index 552ad9867c1d..6f72df9561ef 100644 --- a/docs/core/helpers.rst +++ b/docs/core/helpers.rst @@ -5,7 +5,7 @@ Helpers General Helpers --------------- -.. automodule:: google.api.core.general_helpers +.. automodule:: google.api_core.general_helpers :members: :show-inheritance: @@ -13,7 +13,7 @@ General Helpers Datetime Helpers ---------------- -.. automodule:: google.api.core.datetime_helpers +.. automodule:: google.api_core.datetime_helpers :members: :show-inheritance: @@ -21,6 +21,6 @@ Datetime Helpers gRPC Helpers ------------ -.. automodule:: google.api.core.grpc_helpers +.. automodule:: google.api_core.grpc_helpers :members: :show-inheritance: diff --git a/docs/core/operation.rst b/docs/core/operation.rst index 662c2d9a7726..c5e676621318 100644 --- a/docs/core/operation.rst +++ b/docs/core/operation.rst @@ -1,6 +1,6 @@ Long-Running Operations ======================= -.. automodule:: google.api.core.operation +.. automodule:: google.api_core.operation :members: :show-inheritance: diff --git a/docs/core/operations_client.rst b/docs/core/operations_client.rst index b1ca27fb0c28..be466d3fbf43 100644 --- a/docs/core/operations_client.rst +++ b/docs/core/operations_client.rst @@ -1,6 +1,6 @@ Long-Running Operations Client ============================== -.. automodule:: google.api.core.operations_v1 +.. automodule:: google.api_core.operations_v1 :members: :show-inheritance: diff --git a/docs/core/page_iterator.rst b/docs/core/page_iterator.rst index 70f4acfd578b..28842da2a76d 100644 --- a/docs/core/page_iterator.rst +++ b/docs/core/page_iterator.rst @@ -1,6 +1,6 @@ Page Iterators ============== -.. automodule:: google.api.core.page_iterator +.. automodule:: google.api_core.page_iterator :members: :show-inheritance: diff --git a/docs/core/path_template.rst b/docs/core/path_template.rst index 2e73cc170230..220779e3ba9f 100644 --- a/docs/core/path_template.rst +++ b/docs/core/path_template.rst @@ -1,6 +1,6 @@ Path Templates ============== -.. automodule:: google.api.core.path_template +.. automodule:: google.api_core.path_template :members: :show-inheritance: diff --git a/docs/core/retry.rst b/docs/core/retry.rst index 1da3f564893c..23a7d70f3431 100644 --- a/docs/core/retry.rst +++ b/docs/core/retry.rst @@ -1,6 +1,6 @@ Retry ===== -.. automodule:: google.api.core.retry +.. automodule:: google.api_core.retry :members: :show-inheritance: diff --git a/docs/core/timeout.rst b/docs/core/timeout.rst index 568a4df0cf88..943d42508997 100644 --- a/docs/core/timeout.rst +++ b/docs/core/timeout.rst @@ -1,6 +1,6 @@ Timeout ======= -.. automodule:: google.api.core.timeout +.. automodule:: google.api_core.timeout :members: :show-inheritance: diff --git a/docs/requirements.txt b/docs/requirements.txt index f2ff7f181adc..6b4a1dd4aa9e 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,6 +1,7 @@ setuptools >= 36.4.0 sphinx >= 1.6.3 +api_core/ core/ storage/ bigquery/ diff --git a/nox.py b/nox.py index 8509d34edea2..6c62e088f628 100644 --- a/nox.py +++ b/nox.py @@ -54,8 +54,7 @@ def docs(session): # Install Sphinx and also all of the google-cloud-* packages. session.chdir(os.path.realpath(os.path.dirname(__file__))) - session.install('Sphinx >= 1.6.3', 'sphinx_rtd_theme') - session.install(*ALL_PACKAGES) + session.install('-r', os.path.join('docs', 'requirements.txt')) # Build the docs! session.run( From 748b35ac90406daaa32f0212ffb1ea1fc0a0303c Mon Sep 17 00:00:00 2001 From: Jon Wayne Parrott Date: Wed, 18 Oct 2017 13:19:26 -0700 Subject: [PATCH 2/2] Remove ALL_PACKAGES --- nox.py | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/nox.py b/nox.py index 6c62e088f628..c5d783e4f062 100644 --- a/nox.py +++ b/nox.py @@ -17,31 +17,6 @@ import nox -ALL_PACKAGES = ( - 'core/', - 'storage/', - 'bigquery/', - 'bigtable/', - 'datastore/', - 'dns/', - 'firestore/', - 'language/', - 'logging/', - # error_reporting is out of alphabetical order, it depends on logging. - 'error_reporting/', - 'monitoring/', - 'pubsub/', - 'resource_manager/', - 'runtimeconfig/', - 'spanner/', - 'speech/', - 'trace/', - 'translate/', - 'videointelligence/', - 'vision/', -) - - @nox.session def docs(session): """Build the docs."""