Skip to content

(feat) pandas=3.0 working toward pandas 3.0 compatibility. #194

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

Draft
mnfienen wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

(feat) pandas=3.0 working toward pandas 3.0 compatibility. #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
510c968
(feat) pandas=3.0 working toward pandas 3.0 compatibility. Remaining …
mnfienen Jan 26, 2026
6e13493
fxing test.yaml
mnfienen Mar 16, 2026
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: 5 additions & 2 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,16 @@ jobs:
# persist on the same day.
# cache-environment-key: environment-${{ steps.date.outputs.date }}
# cache-downloads-key: downloads-${{ steps.date.outputs.date }}
create-args: >-
python=${{ matrix.python-version }}
# create-args: >-
# python=${{ matrix.python-version }}
init-shell: >-
bash
powershell
generate-run-shell: false
post-cleanup: none
extra-specs: |
python=${{ matrix.python-version }}

- name: Conda info
shell: bash -l {0}
run: micromamba info
Expand Down
2 changes: 1 addition & 1 deletion installation/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- nodefaults
dependencies:
# required
- python=3.12
- python=3.14
- pip

- numpy
Expand Down
18 changes: 1 addition & 17 deletions notebooks/part0_python_intro/10b_Rasterio_advanced.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,27 +960,11 @@
"source": [
"glaciers.sort_values(by=\"mean_el_change_m\").head()"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "4ca0883e",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "d3b23f72",
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"display_name": "pyclass",
"language": "python",
"name": "python3"
}
Expand Down
29 changes: 10 additions & 19 deletions notebooks/part1_flopy/03_Loading_and_visualizing_models.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,6 +1091,15 @@
"Note: This works best if the in and out columns are aligned, such that ``STO-SY_IN`` and ``STO-SY_OUT`` are both colored orange, for example."
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
"flux"
]
},
{
"cell_type": "code",
"execution_count": null,
Expand All @@ -1100,6 +1109,7 @@
"fig, ax = plt.subplots(figsize=(10, 5))\n",
"in_cols = ['STO-SS_IN', 'STO-SY_IN', 'WEL_IN', 'RCHA_IN', 'CHD_IN', 'SFR_IN', 'LAK_IN']\n",
"out_cols = [c.replace('_IN', '_OUT') for c in in_cols]\n",
"flux = flux.asfreq('ME')\n",
"flux[in_cols].plot.bar(stacked=True, ax=ax)\n",
"(-flux[out_cols]).plot.bar(stacked=True, ax=ax)\n",
"ax.legend(loc='lower left', bbox_to_anchor=(1, 0))\n",
Expand All @@ -1117,32 +1127,13 @@
"\n",
"Fienen, M. N., Haserodt, M. J., and Leaf, A. T. (2021). MODFLOW models used to simulate groundwater flow in the Wisconsin Central Sands Study Area, 2012-2018. New York: U.S. Geological Survey Data Release. doi:10.5066/P9BVFSGJ"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
"kernelspec": {
"display_name": "pyclass",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.12.11"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion notebooks/part1_flopy/04_Modelgrid_and_intersection.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1492,7 +1492,7 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"display_name": "pyclass",
"language": "python",
"name": "python3"
}
Expand Down
20 changes: 2 additions & 18 deletions notebooks/part1_flopy/07-stream_capture_voronoi.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@
"for gage_num in range(2):\n",
" for lay_num in range(3):\n",
" cax = ax[ax_num]\n",
" data = drf.loc[lay_num][f'Gage{gage_num+1}'].values\n",
" data = drf.loc[lay_num][f'Gage{gage_num+1}'].to_numpy(copy=True)\n",
" data[data<0] =0\n",
" mm = fp.plot.PlotMapView(model= base_m, ax=cax)\n",
" mm.plot_bc('SFR', plotAll=True, color='blue')\n",
Expand All @@ -676,27 +676,11 @@
" ax_num += 1\n",
" "
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "4410a94c-541e-470c-acb3-b44a5ad29a68",
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": null,
"id": "db1828c3",
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"display_name": "pyclass",
"language": "python",
"name": "python3"
}
Expand Down
12 changes: 0 additions & 12 deletions notebooks/part1_flopy/08_Modflow-setup-demo.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,18 +793,6 @@
"display_name": "pyclass",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.12.11"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion notebooks/part1_flopy/09-gwt-voronoi-demo.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"display_name": "pyclass",
"language": "python",
"name": "python3"
}
Expand Down
Binary file modified notebooks/part1_flopy/data/pleasant-lake/pleasant.hds
View file
Open in desktop
Binary file not shown.
321 changes: 47 additions & 274 deletions notebooks/part1_flopy/solutions/02-Building-Post-Processing-MODFLOW6__solutions.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 3 additions & 9 deletions notebooks/part1_flopy/solutions/03_Loading_and_visualizing_models-solutions.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,7 @@
"metadata": {},
"outputs": [],
"source": [
"pd.read_csv(sim_ws / 'external/chd_001.dat', delim_whitespace=True)"
"pd.read_csv(sim_ws / 'external/chd_001.dat', sep=r'\\s+')"
]
},
{
Expand Down Expand Up @@ -1130,6 +1130,7 @@
"fig, ax = plt.subplots(figsize=(10, 5))\n",
"in_cols = ['STO-SS_IN', 'STO-SY_IN', 'WEL_IN', 'RCHA_IN', 'CHD_IN', 'SFR_IN', 'LAK_IN']\n",
"out_cols = [c.replace('_IN', '_OUT') for c in in_cols]\n",
"flux = flux.asfreq('ME')\n",
"flux[in_cols].plot.bar(stacked=True, ax=ax)\n",
"(-flux[out_cols]).plot.bar(stacked=True, ax=ax)\n",
"ax.legend(loc='lower left', bbox_to_anchor=(1, 0))\n",
Expand All @@ -1147,13 +1148,6 @@
"\n",
"Fienen, M. N., Haserodt, M. J., and Leaf, A. T. (2021). MODFLOW models used to simulate groundwater flow in the Wisconsin Central Sands Study Area, 2012-2018. New York: U.S. Geological Survey Data Release. doi:10.5066/P9BVFSGJ"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
Expand All @@ -1172,7 +1166,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.12.11"
"version": "3.14.2"
}
},
"nbformat": 4,
Expand Down
2,005 changes: 99 additions & 1,906 deletions notebooks/part1_flopy/solutions/06-Project-quadtree.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions notebooks/part1_flopy/solutions/07-stream_capture_voronoi.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13158,7 +13158,7 @@
},
{
"cell_type": "code",
"execution_count": 47,
"execution_count": null,
"id": "fd8e62ba",
"metadata": {},
"outputs": [
Expand All @@ -13180,7 +13180,7 @@
"for gage_num in range(2):\n",
" for lay_num in range(3):\n",
" cax = ax[ax_num]\n",
" data = drf.loc[lay_num][f'Gage{gage_num+1}'].values\n",
" data = drf.loc[lay_num][f'Gage{gage_num+1}'].to_numpy(copy=True)\n",
" data[data<0] =0\n",
" mm = fp.plot.PlotMapView(model= base_m, ax=cax)\n",
" mm.plot_bc('SFR', plotAll=True, color='blue')\n",
Expand Down
Loading