Skip to content

Commit

Permalink
Replace usage of google.api.core with google.api_core (#4221)
Browse files Browse the repository at this point in the history
* Remove api.core packages from google.cloud.core, make google.cloud.core depend on api_core.

* s/google.api.core/google.api_core/g and nox updates

* Fixing core tests, addressing review feedback

* Fix bigquery
  • Loading branch information
Jon Wayne Parrott authored Oct 18, 2017
1 parent 1d68628 commit 8b10a0a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
6 changes: 3 additions & 3 deletions packages/google-cloud-trace/google/cloud/trace/_gax.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

"""GAX Wrapper for interacting with the Stackdriver Trace API."""

from google.api.core import page_iterator
from google.api_core import page_iterator
from google.cloud.gapic.trace.v1 import trace_service_client
from google.cloud.proto.devtools.cloudtrace.v1 import trace_pb2
from google.gax import CallOptions
Expand Down Expand Up @@ -131,7 +131,7 @@ def list_traces(
passed, the API will return the first page of
entries.
:rtype: :class:`~google.api.core.page_iterator.Iterator`
:rtype: :class:`~google.api_core.page_iterator.Iterator`
:returns: Traces that match the specified filter conditions.
"""
if page_token is None:
Expand Down Expand Up @@ -170,7 +170,7 @@ def _parse_trace_pb(trace_pb):
def _item_to_mapping(iterator, trace_pb):
"""Helper callable function for the GAXIterator
:type iterator: :class:`~google.api.core.page_iterator.Iterator`
:type iterator: :class:`~google.api_core.page_iterator.Iterator`
:param iterator: The iterator that is currently in use.
:type trace_pb: :class:`google.cloud.proto.devtools.cloudtrace.v1.
Expand Down
2 changes: 1 addition & 1 deletion packages/google-cloud-trace/google/cloud/trace/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def list_traces(
passed, the API will return the first page of
entries.
:rtype: :class:`~google.api.core.page_iterator.Iterator`
:rtype: :class:`~google.api_core.page_iterator.Iterator`
:returns: Traces that match the specified filter conditions.
"""
if project_id is None:
Expand Down
5 changes: 4 additions & 1 deletion packages/google-cloud-trace/nox.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@
import nox


LOCAL_DEPS = ('../core/',)
LOCAL_DEPS = (
os.path.join('..', 'api_core'),
os.path.join('..', 'core'),
)


@nox.session
Expand Down

0 comments on commit 8b10a0a

Please sign in to comment.