Upgrade gspread to 5>=

Author: aiguofer

gspread_pandas/__init__.py

@@ -1,4 +1,4 @@
-from gspread.models import Spreadsheet
+from gspread import Spreadsheet
 from gspread.urls import SPREADSHEETS_API_V4_BASE_URL
 
 from ._version import __version__, __version_info__

gspread_pandas/client.py

@@ -1,9 +1,9 @@
 import requests
 from google.auth.credentials import Credentials
 from google.auth.transport.requests import AuthorizedSession
+from gspread import Spreadsheet
 from gspread.client import Client as ClientV4
 from gspread.exceptions import APIError, SpreadsheetNotFound
-from gspread.models import Spreadsheet
 from gspread.utils import finditem
 
 from gspread_pandas.conf import default_scope, get_creds
@@ -214,7 +214,7 @@ def open(self, title):
         :param title: A title of a spreadsheet.
         :type title: str
 
-        :returns: a :class:`~gspread.models.Spreadsheet` instance.
+        :returns: a :class:`~gspread.spreadsheet.Spreadsheet` instance.
 
         If there's more than one spreadsheet with same title the first one
         will be opened.

gspread_pandas/spread.py

@@ -3,14 +3,14 @@
 
 import numpy as np
 import pandas as pd
+from gspread import Spreadsheet, Worksheet
 from gspread.exceptions import (
     APIError,
     NoValidUrlKeyFound,
     SpreadsheetNotFound,
     WorksheetNotFound,
 )
-from gspread.models import Worksheet
-from gspread.utils import fill_gaps, rightpad
+from gspread.utils import ValueInputOption, ValueRenderOption, fill_gaps, rightpad
 
 from gspread_pandas.client import Client
 from gspread_pandas.conf import default_scope
@@ -93,17 +93,16 @@ class Spread:
         for the expected format
     """
 
-    #: `(gspread.models.Spreadsheet)` - Currently open Spreadsheet
-    spread = None
+    #: `(gspread.spreadsheet.Spreadsheet)` - Currently open Spreadsheet
+    spread: Spreadsheet = None
 
-    #: `(gspread.models.Worksheet)` - Currently open Worksheet
-    sheet = None
+    #: `(gspread.worksheet.Worksheet)` - Currently open Worksheet
+    sheet: Worksheet = None
 
     #: `(Client)` - Instance of gspread_pandas
     #: :class:`Client <gspread_pandas.client.Client>`
     client = None
 
-    # chunk range request: https://github.com/burnash/gspread/issues/375
     _max_range_chunk_size = 1000000
 
     # `(dict)` - Spreadsheet metadata
@@ -304,7 +303,7 @@ def create_sheet(self, name, rows=1, cols=1):
         self.refresh_spread_metadata()
         self.open_sheet(name)
 
-    def _get_columns(self, cols, value_render_option="FORMATTED_VALUE"):
+    def _get_columns(self, cols, value_render_option=ValueRenderOption.formatted):
         """
         Returns a list of all values in `cols`.
 
@@ -407,12 +406,16 @@ def sheet_to_df(
                 header_rows + start_row - 1,
                 col_names,
                 unformatted_columns,
-                "UNFORMATTED_VALUE",
+                ValueRenderOption.unformatted,
             )
 
         if formula_columns:
             self._fix_value_render(
-                df, header_rows + start_row - 1, col_names, formula_columns, "FORMULA"
+                df,
+                header_rows + start_row - 1,
+                col_names,
+                formula_columns,
+                ValueRenderOption.formula,
             )
 
         df = set_col_names(df, col_names)
@@ -509,13 +512,13 @@ def update_cells(self, start, end, vals, sheet=None, raw_columns=None):
                     raw_columns, list
                 ), "raw_columns must be a list of ints"
                 raw_cells = [i for i in cells if i.col in raw_columns]
-                self.sheet.update_cells(raw_cells, "RAW")
+                self.sheet.update_cells(raw_cells, ValueInputOption.raw)
             else:
                 raw_cells = []
 
             user_cells = [i for i in cells if i not in raw_cells]
             if user_cells:
-                self.sheet.update_cells(user_cells, "USER_ENTERED")
+                self.sheet.update_cells(user_cells, ValueInputOption.user_entered)
 
     def _ensure_sheet(self, sheet):
         if sheet is not None:
@@ -784,7 +787,7 @@ def _fix_merge_values(self, vals):
         ----------
         vals : list
             Values returned by
-            :meth:`get_all_values() <gspread.models.Sheet.get_all_values()>_`
+            :meth:`get_all_values() <gspread.worksheet.Worksheet.get_all_values()>_`
 
 
         Returns

requirements.txt

@@ -1,5 +1,5 @@
 # Reqs
-gspread<5.0.0
+gspread>=5.0.0
 pandas>=0.20.0
 decorator
 google-auth

tests/spread_test.py

@@ -1,6 +1,6 @@
 import pandas as pd
 import pytest
-from gspread.models import Worksheet
+from gspread import Worksheet
 
 from gspread_pandas import Spread, util