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

Jump to bottom

Backport PR #2065 to address issue #2066, then bump version to 0.18.1 for urgent release. #2067

Merged
merged 2 commits into from
Aug 9, 2016
Merged

Backport PR #2065 to address issue #2066, then bump version to 0.18.1 for urgent release. #2067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c91644
Backport PR #2065 to address issue #2066.
tseaver Aug 9, 2016
168414a
Bump version to 0.18.1 for urgent release.
tseaver Aug 9, 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
6 changes: 3 additions & 3 deletions gcloud/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.logging.v2.config_service_v2_api import (
from google.cloud.logging.v2.config_service_v2_api import (
ConfigServiceV2Api as GeneratedSinksAPI)
from google.logging.v2.logging_service_v2_api import (
from google.cloud.logging.v2.logging_service_v2_api import (
LoggingServiceV2Api as GeneratedLoggingAPI)
from google.logging.v2.metrics_service_v2_api import (
from google.cloud.logging.v2.metrics_service_v2_api import (
MetricsServiceV2Api as GeneratedMetricsAPI)
from gcloud.logging._gax import _LoggingAPI as GAXLoggingAPI
from gcloud.logging._gax import _MetricsAPI as GAXMetricsAPI
Expand Down
4 changes: 2 additions & 2 deletions gcloud/pubsub/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@

# pylint: disable=ungrouped-imports
try:
from google.pubsub.v1.publisher_api import (
from google.cloud.pubsub.v1.publisher_api import (
PublisherApi as GeneratedPublisherAPI)
from google.pubsub.v1.subscriber_api import (
from google.cloud.pubsub.v1.subscriber_api import (
SubscriberApi as GeneratedSubscriberAPI)
from gcloud.pubsub._gax import _PublisherAPI as GAXPublisherAPI
from gcloud.pubsub._gax import _SubscriberAPI as GAXSubscriberAPI
Expand Down
12 changes: 6 additions & 6 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@

GRPC_EXTRAS = [
'grpcio >= 1.0rc1',
'google-gax >= 0.12.3, < 0.13dev',
'gax-google-pubsub-v1 >= 0.7.12, < 0.8dev',
'grpc-google-pubsub-v1 >= 0.7.12, < 0.8dev',
'gax-google-logging-v2 >= 0.7.12, < 0.8dev',
'grpc-google-logging-v2 >= 0.7.12, < 0.8dev',
'google-gax >= 0.12.3',
'gax-google-pubsub-v1 >= 0.8.0',
'grpc-google-pubsub-v1 >= 0.8.0',
'gax-google-logging-v2 >= 0.8.0',
'grpc-google-logging-v2 >= 0.8.0',
]

if sys.version_info[:2] == (2, 7) and 'READTHEDOCS' not in os.environ:
REQUIREMENTS.extend(GRPC_EXTRAS)

setup(
name='gcloud',
version='0.18.0',
version='0.18.1',
description='API Client library for Google Cloud',
author='Google Cloud Platform',
author_email='jjg+gcloud-python@google.com',
Expand Down
10 changes: 5 additions & 5 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ covercmd =
[grpc]
deps =
grpcio >= 1.0rc1
google-gax >= 0.12.3, < 0.13dev
gax-google-pubsub-v1 >= 0.7.12, < 0.8dev
grpc-google-pubsub-v1 >= 0.7.12, < 0.8dev
gax-google-logging-v2 >= 0.7.12, < 0.8dev
grpc-google-logging-v2 >= 0.7.12, < 0.8dev
google-gax >= 0.12.3
gax-google-pubsub-v1 >= 0.8.0
grpc-google-pubsub-v1 >= 0.8.0
gax-google-logging-v2 >= 0.8.0
grpc-google-logging-v2 >= 0.8.0

[docs]
deps =
Expand Down