Skip to content

Upgrade dependencies to gapic-* 0.9.x packages #2324

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

Merged
dhermes merged 4 commits into from
Sep 16, 2016
Merged

Upgrade dependencies to gapic-* 0.9.x packages #2324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df337ca
Upgrade dependencies to gapic-* 0.9.x packages
Sep 15, 2016
2501775
Fix import statements
Sep 16, 2016
8120a72
Merge branch 'master' into breaking-gapic-changes
Sep 16, 2016
d1019d0
Updating coverage ignored modules for gapic package.
dhermes Sep 16, 2016
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
3 changes: 1 addition & 2 deletions .coveragerc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ branch = True
omit =
*/_generated/*.py
# Packages in the "google.cloud" package that we don't own.
*/google/cloud/logging/v2/*
*/google/cloud/pubsub/v1/*
*/google/cloud/gapic/*
fail_under = 100
show_missing = True
exclude_lines =
Expand Down
6 changes: 3 additions & 3 deletions google/cloud/logging/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
import os

try:
from google.cloud.logging.v2.config_service_v2_api import (
from google.cloud.gapic.logging.v2.config_service_v2_api import (
ConfigServiceV2Api as GeneratedSinksAPI)
from google.cloud.logging.v2.logging_service_v2_api import (
from google.cloud.gapic.logging.v2.logging_service_v2_api import (
LoggingServiceV2Api as GeneratedLoggingAPI)
from google.cloud.logging.v2.metrics_service_v2_api import (
from google.cloud.gapic.logging.v2.metrics_service_v2_api import (
MetricsServiceV2Api as GeneratedMetricsAPI)
from google.cloud.logging._gax import _LoggingAPI as GAXLoggingAPI
from google.cloud.logging._gax import _MetricsAPI as GAXMetricsAPI
Expand Down
4 changes: 2 additions & 2 deletions google/cloud/pubsub/_gax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

"""GAX wrapper for Pubsub API requests."""

from google.cloud.pubsub.v1.publisher_api import PublisherApi
from google.cloud.pubsub.v1.subscriber_api import SubscriberApi
from google.cloud.gapic.pubsub.v1.publisher_api import PublisherApi
from google.cloud.gapic.pubsub.v1.subscriber_api import SubscriberApi
from google.gax import CallOptions
from google.gax import INITIAL_PAGE
from google.gax.errors import GaxError
Expand Down
14 changes: 7 additions & 7 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
'httplib2 >= 0.9.1',
'googleapis-common-protos',
'oauth2client >= 2.0.1',
'protobuf >= 3.0.0b2, != 3.0.0.b2.post1',
'protobuf >= 3.0.0',
'six',
]

GRPC_PACKAGES = [
'grpcio >= 1.0rc1',
'google-gax >= 0.12.3, < 0.13dev',
'gax-google-pubsub-v1 >= 0.8.0, < 0.9dev',
'grpc-google-pubsub-v1 >= 0.8.0, < 0.9dev',
'gax-google-logging-v2 >= 0.8.0, < 0.9dev',
'grpc-google-logging-v2 >= 0.8.0, < 0.9dev',
'grpcio >= 1.0.0',
'google-gax >= 0.13.0, < 0.14dev',
'gapic-google-pubsub-v1 >= 0.9.0, < 0.10dev',
'grpc-google-pubsub-v1 >= 0.9.0, < 0.10dev',
'gapic-google-logging-v2 >= 0.9.0, < 0.10dev',
'grpc-google-logging-v2 >= 0.9.0, < 0.10dev',

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

]

RTD_ENV_VAR = 'READTHEDOCS'
Expand Down