Skip to content

Commit

Permalink
Update code to match with newest Validators version and fix Pandas 2.…
Browse files Browse the repository at this point in the history
…1 support by enforcing newest version of Duckdb
  • Loading branch information
sfc-gh-tszerszen authored Sep 26, 2023
2 parents 090e94e + 70dc3e4 commit e8d512f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import setuptools

VERSION = "0.0.1" # PEP-440
VERSION = "0.0.2" # PEP-440

NAME = "streamlit_gsheets"

Expand All @@ -10,9 +10,10 @@
"gspread-pandas>=3.2.2",
"gspread-dataframe>=3.3.0",
"gspread-formatting>=1.1.2",
"duckdb>=0.7.1",
"pandas>=1.3.0, <2",
"duckdb>=0.8.1",
"sql-metadata>=2.7.0",
"validators>=0.20.0",
"validators>=0.22.0",
]


Expand Down
16 changes: 8 additions & 8 deletions streamlit_gsheets/gsheets_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
from streamlit.runtime.caching import cache_data
from streamlit.type_util import convert_anything_to_df, is_dataframe_compatible
from validators.url import url as validate_url
from validators.utils import ValidationFailure
from validators.utils import ValidationError


class GSheetsClient(ABC):
Expand Down Expand Up @@ -144,10 +144,10 @@ def _open_spreadsheet(
if validate_url(spreadsheet):
return self._client.open_by_url(url=spreadsheet)
else:
raise ValidationFailure(
"spreadsheet is not URL", args={"spreadsheet": spreadsheet}
raise ValidationError(
"spreadsheet is not URL", arg_dict={"spreadsheet": spreadsheet}
)
except ValidationFailure:
except ValidationError:
return self._client.open(title=spreadsheet, folder_id=folder_id)

def _select_worksheet(
Expand Down Expand Up @@ -318,7 +318,7 @@ def update(
if not folder_id and self._worksheet:
folder_id = self._worksheet

if type(spreadsheet) is str:
if isinstance(spreadsheet, str):
spreadsheet = self._open_spreadsheet(
spreadsheet=spreadsheet, folder_id=folder_id
)
Expand Down Expand Up @@ -367,9 +367,9 @@ def _get_download_as_csv_url(
spreadsheet: str,
worksheet: str | int | None = None,
) -> str:
validation_failure = ValidationFailure(
validation_failure = ValidationError(
"spreadsheet validation failure",
args={"spreadsheet": spreadsheet},
arg_dict={"spreadsheet": spreadsheet},
)
try:
if validate_url(spreadsheet): # type: ignore
Expand All @@ -396,7 +396,7 @@ def _get_download_as_csv_url(
return url
else:
raise validation_failure
except (ValidationFailure, TypeError):
except (ValidationError, TypeError):
url = (
f"https://docs.google.com/spreadsheet/ccc?key={spreadsheet}&output=csv"
)
Expand Down

0 comments on commit e8d512f

Please sign in to comment.