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

Upgrade gspread 3.1.0 for supporting team drive #3838

Merged
merged 4 commits into from
Jun 6, 2019
Merged

Upgrade gspread 3.1.0 for supporting team drive #3838

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e53e8cb
Upgrade gspread 3.1.0 for supporting team drive
koooge May 22, 2019
e9074a3
Revert "Upgrade gspread 3.1.0 for supporting team drive"
koooge May 29, 2019
9382c41
Upgrade gspread 3.1.0 for supporting team drive
koooge May 29, 2019
60cd127
Update Sheets query runner name
arikfr Jun 6, 2019
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
7 changes: 1 addition & 6 deletions redash/query_runner/google_spreadsheets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

try:
import gspread
from gspread.httpsession import HTTPSession
from oauth2client.service_account import ServiceAccountCredentials

enabled = True
Expand Down Expand Up @@ -166,11 +165,7 @@ def _get_spreadsheet_service(self):
key = json_loads(b64decode(self.configuration['jsonKeyFile']))
creds = ServiceAccountCredentials.from_json_keyfile_dict(key, scope)

timeout_session = HTTPSession()
timeout_session.requests_session = TimeoutSession()
spreadsheetservice = gspread.Client(auth=creds, http_session=timeout_session)
spreadsheetservice.login()
return spreadsheetservice
return gspread.authorize(creds)
Copy link
Member

Choose a reason for hiding this comment

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

Why did you remove the timeout handling?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

oops. Because gspread.httpsession was not found, but I will fix it

Traceback (most recent call last):
  File "main.py", line 2, in <module>
    from gspread.httpsession import HTTPSession
ModuleNotFoundError: No module named 'gspread.httpsession

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I fixed it 🙏
https://gspread.readthedocs.io/en/latest/api.html?highlight=session#client


def test_connection(self):
self._get_spreadsheet_service()
Expand Down
2 changes: 1 addition & 1 deletion requirements_all_ds.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
google-api-python-client==1.5.1
gspread==0.6.2
gspread==3.1.0
impyla==0.10.0
influxdb==2.7.1
MySQL-python==1.2.5
Expand Down