Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Datacatalog: Add nox session docs, reorder methods (via synth). #7766

Merged
merged 3 commits into from
May 1, 2019
Merged

Datacatalog: Add nox session docs, reorder methods (via synth). #7766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6066a3
[CHANGE ME] Re-generated datacatalog to pick up changes in the API or…
yoshi-automation Apr 23, 2019
427c520
Finish setup for nox session .
busunkim96 May 1, 2019
7c22f88
Exclude docs/conf.py.
busunkim96 May 1, 2019
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
1 change: 1 addition & 0 deletions datacatalog/docs/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../README.rst
2 changes: 1 addition & 1 deletion datacatalog/docs/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. include:: /../datacatalog/README.rst
.. include:: README.rst


API Reference
Expand Down
16 changes: 8 additions & 8 deletions datacatalog/google/cloud/datacatalog_v1beta1/gapic/data_catalog_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,23 +74,23 @@ def from_service_account_file(cls, filename, *args, **kwargs):
from_service_account_json = from_service_account_file

@classmethod
def location_path(cls, project, location):
"""Return a fully-qualified location string."""
def entry_path(cls, project, location, entry_group, entry):
"""Return a fully-qualified entry string."""
return google.api_core.path_template.expand(
"projects/{project}/locations/{location}",
"projects/{project}/locations/{location}/entryGroups/{entry_group}/entries/{entry}",
project=project,
location=location,
entry_group=entry_group,
entry=entry,
)

@classmethod
def entry_path(cls, project, location, entry_group, entry):
"""Return a fully-qualified entry string."""
def location_path(cls, project, location):
"""Return a fully-qualified location string."""
return google.api_core.path_template.expand(
"projects/{project}/locations/{location}/entryGroups/{entry_group}/entries/{entry}",
"projects/{project}/locations/{location}",
project=project,
location=location,
entry_group=entry_group,
entry=entry,
)

def __init__(
Expand Down
20 changes: 20 additions & 0 deletions datacatalog/noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

from __future__ import absolute_import
import os
import shutil

import nox

Expand Down Expand Up @@ -138,3 +139,22 @@ def cover(session):
session.run("coverage", "report", "--show-missing", "--fail-under=80")

session.run("coverage", "erase")

@nox.session(python="3.7")
def docs(session):
"""Build the docs for this library."""

session.install('-e', '.')
session.install('sphinx', 'alabaster', 'recommonmark')

shutil.rmtree(os.path.join('docs', '_build'), ignore_errors=True)
session.run(
'sphinx-build',
'-W', # warnings as errors
'-T', # show full traceback on exception
'-N', # no colors
'-b', 'html',
'-d', os.path.join('docs', '_build', 'doctrees', ''),
os.path.join('docs', ''),
os.path.join('docs', '_build', 'html', ''),
)
16 changes: 12 additions & 4 deletions datacatalog/synth.metadata
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
{
"updateTime": "2019-04-15T18:20:24.527055Z",
"updateTime": "2019-05-01T20:20:02.550542Z",
"sources": [
{
"generator": {
"name": "artman",
"version": "0.16.25",
"dockerImage": "googleapis/artman@sha256:d9597f983d1d4e61272c63cb97b7d8f8234da9999526c35d357de3d781f0ec1b"
"version": "0.17.1",
"dockerImage": "googleapis/artman@sha256:a40ca4dd4ef031c0ded4df4909ffdf7b3f20d29b23e682ef991eb60ba0ca6025"
}
},
{
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
"sha": "316b54c401ab9bc08ed71cb362915b9e7a23bb05",
"internalRef": "246014263"
}
},
{
"template": {
"name": "python_library",
"origin": "synthtool.gcp",
"version": "2019.4.10"
"version": "2019.4.24"
}
}
],
Expand Down