(feat) pandas=3.0 working toward pandas 3.0 compatibility. Remaining failing tests are for modflow-setup which is being updated and gridgen binaries failing on Mac OS

Author: mnfienen

installation/environment.yml

@@ -4,7 +4,7 @@ channels:
   - nodefaults
 dependencies:
   # required
-  - python=3.12
+  - python=3.14
   - pip
 
   - numpy

notebooks/part0_python_intro/10b_Rasterio_advanced.ipynb

@@ -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"
   }

notebooks/part1_flopy/03_Loading_and_visualizing_models.ipynb

@@ -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,
@@ -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",
@@ -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,

notebooks/part1_flopy/04_Modelgrid_and_intersection.ipynb

@@ -1492,7 +1492,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "pyclass",
    "language": "python",
    "name": "python3"
   }

notebooks/part1_flopy/07-stream_capture_voronoi.ipynb

@@ -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",
@@ -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"
   }

notebooks/part1_flopy/08_Modflow-setup-demo.ipynb

@@ -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,

notebooks/part1_flopy/09-gwt-voronoi-demo.ipynb

@@ -471,7 +471,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "pyclass",
    "language": "python",
    "name": "python3"
   }

notebooks/part1_flopy/data/pleasant-lake/pleasant.hds

@@ -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+')"
    ]
   },
   {
@@ -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",
@@ -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": {
@@ -1172,7 +1166,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.11"
+   "version": "3.14.2"
   }
  },
  "nbformat": 4,