Skip to content
This repository was archived by the owner on Mar 20, 2018. It is now read-only.

Remove references to grpc.beta #127

Merged
geigerj merged 2 commits into from
Sep 9, 2016
Merged

Remove references to grpc.beta #127

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06e8393
Remove references to grpc.beta
geigerj Aug 23, 2016
9b7c483
PR Feedback
geigerj Sep 7, 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
Prev Previous commit
PR Feedback
  • Loading branch information
@geigerj
geigerj committed Sep 7, 2016
commit 9b7c483e209565e8ce2f1c2319c7236e3781cd5f
2 changes: 1 addition & 1 deletion google/gax/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import collections


__version__ = '0.12.6'
__version__ = '0.13.0'


INITIAL_PAGE = object()
Expand Down
2 changes: 1 addition & 1 deletion google/gax/grpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def create_stub(generated_create_stub, service_path, port, ssl_creds=None,
"""
if channel is None:
if ssl_creds is None:
ssl_creds = grpc.ssl_channel_credentials(None, None, None)
ssl_creds = grpc.ssl_channel_credentials()
if metadata_transformer is None:
if scopes is None:
scopes = []
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
'future>=0.15.2',
'grpcio>=1.0.0',
Copy link
Copy Markdown
Contributor

@bjwatson bjwatson Aug 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to regenerate the auto-gen code with 1.0.0 to ensure everything still works correctly?

Copy link
Copy Markdown
Contributor

@bjwatson bjwatson Aug 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, let's update test-requirements.txt.

Copy link
Copy Markdown
Contributor Author

@geigerj geigerj Sep 7, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to regenerate the auto-gen code with 1.0.0 to ensure everything still works correctly?

Yes. GAX 0.13.0 will not work with older auto-gen code, since those have only beta entry points into the gRPC stub.

Also, let's update test-requirements.txt.

Done

'ply==3.8',
'protobuf>=3.0.0b3',
'protobuf>=3.0.0',
'oauth2client>=1.5.2',
]

Expand Down
9 changes: 1 addition & 8 deletions test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,4 @@ pytest>=2.8.3
pytest-cov>=1.8.1
pytest-timeout>=1.0.0
unittest2>=1.1.0

# TODO: remove this line when grpcio goes to 1.0.0. This is only necessary
# because pip (running in Travis CI) will not install the release candidate
# when it gets pulled in as a dependency of grpcio-tools, below, which causes
# build failure in Python 3 environments
grpcio>=1.0.0rc1

grpcio-tools>=1.0.0rc2
grpcio-tools>=1.0.0
4 changes: 2 additions & 2 deletions test/test_grpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def test_creates_a_stub_ok_with_no_scopes(
self, auth, chan, chan_creds, comp):
got_channel = grpc.create_stub(
_fake_create_stub, self.FAKE_SERVICE_PATH, self.FAKE_PORT)
chan_creds.assert_called_once_with(None, None, None)
chan_creds.assert_called_once_with()
chan.assert_called_once_with(
'{}:{}'.format(self.FAKE_SERVICE_PATH, self.FAKE_PORT),
comp.return_value)
Expand All @@ -71,7 +71,7 @@ def test_creates_a_stub_ok_with_scopes(
grpc.create_stub(
_fake_create_stub, self.FAKE_SERVICE_PATH, self.FAKE_PORT,
scopes=fake_scopes)
chan_creds.assert_called_once_with(None, None, None)
chan_creds.assert_called_once_with()
chan.assert_called_once_with(
'{}:{}'.format(self.FAKE_SERVICE_PATH, self.FAKE_PORT),
comp.return_value)
Expand Down