Skip to content

Commit

Permalink
Merge pull request #170 from tomsail/master
Browse files Browse the repository at this point in the history
upgraded to pandas 2.1. Fixes #134
  • Loading branch information
tomsail authored Nov 7, 2023
2 parents d32f16b + 4a4f5b8 commit 9cfd3bb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions pyposeidon/schism.py
Original file line number Diff line number Diff line change
Expand Up @@ -1517,11 +1517,11 @@ def results(self, **kwargs):
date.columns = ["year", "month", "day", "hour", "utc"] # rename the columns
# set the start timestamp
sdate = pd.Timestamp(
year=date.year.values[0],
month=date.month.values[0],
day=date.day.values[0],
hour=date.hour.values[0],
tz=date.utc.values[0],
year=int(date.year.values[0]),
month=int(date.month.values[0]),
day=int(date.day.values[0]),
hour=int(date.hour.values[0]),
tz=int(date.utc.values[0]),
)

logger.info("done with generic variables \n")
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ joblib = "*"
llvmlite = "*"
netCDF4 = "*"
numpy = ">=1.20, <2.0"
pandas = "<2"
pandas = "*"
psutil = "*"
pydap = ">=3.4.0"
pyresample = "*"
Expand Down

0 comments on commit 9cfd3bb

Please sign in to comment.