Skip to content

Commit

Permalink
Merge pull request #16 from agile-analytics-au/master
Browse files Browse the repository at this point in the history
Make gauge getter compatible with pandas 2 or greater
  • Loading branch information
BenBMDBA authored Sep 5, 2023
2 parents c820c67 + 159b0c8 commit 857579d
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tox-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: ["3.7", "3.8", "3.9", "3.10"]
python-version: ["3.7", "3.8", "3.9", "3.10","3.11"]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion mdba_gauge_getter/gauge_getter.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def init() -> None:
gauges = pd.read_csv(gauge_data_uri, skiprows=1, skipfooter=1,
names=['gauge_name', 'gauge_number',
'gauge_owner', 'lat', 'long'], engine='python')
gauges['State'] = gauges['gauge_owner'].str.strip().str.split(' ', 1).str[0]
gauges['State'] = gauges['gauge_owner'].apply(lambda x: x.strip().split(' ', 1)[0])
gauges = gauges.drop(['lat', 'long', 'gauge_owner'], axis=1)


Expand Down
2 changes: 1 addition & 1 deletion mdba_gauge_getter/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.4.7'
__version__ = '0.5.0'
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

requests
pandas==1.3.5
pandas
bomwater

6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@
},
classifiers=[
"Operating System :: OS Independent",
"Programming Language :: Python :: 3",
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Framework :: Pytest',
],
packages=[
"mdba_gauge_getter",
],
install_requires=[
"pandas==1.3.5",
"pandas",
"requests",
"bomwater",
],
package_data={"": ["data/*.csv"]},
python_requires=">=3.6",
python_requires=">=3.7",
)
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ python =
3.8: py38
3.9: py39
3.10: python3.10
3.11: python3.11

[testenv]
deps = -rrequirements-dev.txt
Expand Down

0 comments on commit 857579d

Please sign in to comment.