Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix: bump grpcio version to use stable aio API (#234)
  • Loading branch information
lidizheng committed Aug 13, 2021
1 parent 362ca6c commit bdbf889
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion google/api_core/grpc_helpers_async.py
Expand Up @@ -22,7 +22,7 @@
import functools

import grpc
from grpc.experimental import aio
from grpc import aio

from google.api_core import exceptions, grpc_helpers

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -37,7 +37,7 @@
'futures >= 3.2.0; python_version < "3.2"',
]
extras = {
"grpc": "grpcio >= 1.29.0, < 2.0dev",
"grpc": "grpcio >= 1.33.2, < 2.0dev",
"grpcgcp": "grpcio-gcp >= 0.2.2",
"grpcio-gcp": "grpcio-gcp >= 0.2.2",
}
Expand Down
2 changes: 1 addition & 1 deletion testing/constraints-3.6.txt
Expand Up @@ -11,6 +11,6 @@ google-auth==1.25.0
requests==2.18.0
setuptools==40.3.0
packaging==14.3
grpcio==1.29.0
grpcio==1.33.2
grpcio-gcp==0.2.2
grpcio-gcp==0.2.2
2 changes: 1 addition & 1 deletion tests/asyncio/gapic/test_method_async.py
Expand Up @@ -14,7 +14,7 @@

import datetime

from grpc.experimental import aio
from grpc import aio
import mock
import pytest

Expand Down
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from grpc.experimental import aio
from grpc import aio
import mock
import pytest

Expand Down
28 changes: 14 additions & 14 deletions tests/asyncio/test_grpc_helpers_async.py
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

import grpc
from grpc.experimental import aio
from grpc import aio
import mock
import pytest

Expand Down Expand Up @@ -270,7 +270,7 @@ def test_wrap_errors_streaming(wrap_stream_errors):
autospec=True,
return_value=(mock.sentinel.credentials, mock.sentinel.projet),
)
@mock.patch("grpc.experimental.aio.secure_channel")
@mock.patch("grpc.aio.secure_channel")
def test_create_channel_implicit(grpc_secure_channel, default, composite_creds_call):
target = "example.com:443"
composite_creds = composite_creds_call.return_value
Expand All @@ -295,7 +295,7 @@ def test_create_channel_implicit(grpc_secure_channel, default, composite_creds_c
autospec=True,
return_value=(mock.sentinel.credentials, mock.sentinel.projet),
)
@mock.patch("grpc.experimental.aio.secure_channel")
@mock.patch("grpc.aio.secure_channel")
def test_create_channel_implicit_with_default_host(
grpc_secure_channel, default, composite_creds_call, request, auth_metadata_plugin
):
Expand All @@ -319,7 +319,7 @@ def test_create_channel_implicit_with_default_host(
"google.auth.default",
return_value=(mock.sentinel.credentials, mock.sentinel.projet),
)
@mock.patch("grpc.experimental.aio.secure_channel")
@mock.patch("grpc.aio.secure_channel")
def test_create_channel_implicit_with_ssl_creds(
grpc_secure_channel, default, composite_creds_call
):
Expand All @@ -341,7 +341,7 @@ def test_create_channel_implicit_with_ssl_creds(
autospec=True,
return_value=(mock.sentinel.credentials, mock.sentinel.projet),
)
@mock.patch("grpc.experimental.aio.secure_channel")
@mock.patch("grpc.aio.secure_channel")
def test_create_channel_implicit_with_scopes(
grpc_secure_channel, default, composite_creds_call
):
Expand All @@ -362,7 +362,7 @@ def test_create_channel_implicit_with_scopes(
autospec=True,
return_value=(mock.sentinel.credentials, mock.sentinel.projet),
)
@mock.patch("grpc.experimental.aio.secure_channel")
@mock.patch("grpc.aio.secure_channel")
def test_create_channel_implicit_with_default_scopes(
grpc_secure_channel, default, composite_creds_call
):
Expand Down Expand Up @@ -394,7 +394,7 @@ def test_create_channel_explicit_with_duplicate_credentials():

@mock.patch("grpc.composite_channel_credentials")
@mock.patch("google.auth.credentials.with_scopes_if_required", autospec=True)
@mock.patch("grpc.experimental.aio.secure_channel")
@mock.patch("grpc.aio.secure_channel")
def test_create_channel_explicit(grpc_secure_channel, auth_creds, composite_creds_call):
target = "example.com:443"
composite_creds = composite_creds_call.return_value
Expand All @@ -411,7 +411,7 @@ def test_create_channel_explicit(grpc_secure_channel, auth_creds, composite_cred


@mock.patch("grpc.composite_channel_credentials")
@mock.patch("grpc.experimental.aio.secure_channel")
@mock.patch("grpc.aio.secure_channel")
def test_create_channel_explicit_scoped(grpc_secure_channel, composite_creds_call):
target = "example.com:443"
scopes = ["1", "2"]
Expand All @@ -430,7 +430,7 @@ def test_create_channel_explicit_scoped(grpc_secure_channel, composite_creds_cal


@mock.patch("grpc.composite_channel_credentials")
@mock.patch("grpc.experimental.aio.secure_channel")
@mock.patch("grpc.aio.secure_channel")
def test_create_channel_explicit_default_scopes(
grpc_secure_channel, composite_creds_call
):
Expand All @@ -453,7 +453,7 @@ def test_create_channel_explicit_default_scopes(


@mock.patch("grpc.composite_channel_credentials")
@mock.patch("grpc.experimental.aio.secure_channel")
@mock.patch("grpc.aio.secure_channel")
def test_create_channel_explicit_with_quota_project(
grpc_secure_channel, composite_creds_call
):
Expand All @@ -474,7 +474,7 @@ def test_create_channel_explicit_with_quota_project(


@mock.patch("grpc.composite_channel_credentials")
@mock.patch("grpc.experimental.aio.secure_channel")
@mock.patch("grpc.aio.secure_channel")
@mock.patch(
"google.auth.load_credentials_from_file",
autospec=True,
Expand All @@ -500,7 +500,7 @@ def test_create_channnel_with_credentials_file(


@mock.patch("grpc.composite_channel_credentials")
@mock.patch("grpc.experimental.aio.secure_channel")
@mock.patch("grpc.aio.secure_channel")
@mock.patch(
"google.auth.load_credentials_from_file",
autospec=True,
Expand All @@ -527,7 +527,7 @@ def test_create_channel_with_credentials_file_and_scopes(


@mock.patch("grpc.composite_channel_credentials")
@mock.patch("grpc.experimental.aio.secure_channel")
@mock.patch("grpc.aio.secure_channel")
@mock.patch(
"google.auth.load_credentials_from_file",
autospec=True,
Expand Down Expand Up @@ -556,7 +556,7 @@ def test_create_channel_with_credentials_file_and_default_scopes(
@pytest.mark.skipif(
grpc_helpers_async.HAS_GRPC_GCP, reason="grpc_gcp module not available"
)
@mock.patch("grpc.experimental.aio.secure_channel")
@mock.patch("grpc.aio.secure_channel")
def test_create_channel_without_grpc_gcp(grpc_secure_channel):
target = "example.com:443"
scopes = ["test_scope"]
Expand Down

0 comments on commit bdbf889

Please sign in to comment.