Merge branch 'main' into zedwick/remap-overhaul

UXARRAY · Oct 3, 2024 · 16c0af6 · 16c0af6
2 parents 1533200 + 510e299
commit 16c0af6
Show file tree

Hide file tree

Showing 28 changed files with 4,364 additions and 6,689 deletions.
diff --git a/benchmarks/mpas_ocean.py b/benchmarks/mpas_ocean.py
@@ -81,8 +81,6 @@ class GeoDataFrame(DatasetBenchmark):
     def time_to_geodataframe(self, resolution, exclude_antimeridian):
         self.uxds[data_var].to_geodataframe(exclude_antimeridian=exclude_antimeridian)
 
-    def peakmem_to_geodataframe(self, resolution, exclude_antimeridian):
-        gdf = self.uxds[data_var].to_geodataframe(exclude_antimeridian=exclude_antimeridian)
 
 
 class ConnectivityConstruction(DatasetBenchmark):

diff --git a/ci/asv.yml b/ci/asv.yml
@@ -7,6 +7,7 @@ dependencies:
   - dask
   - datashader
   - gmpy2
+  - geoviews
   - holoviews
   - matplotlib-base
   - matplotlib-inline
@@ -27,6 +28,7 @@ dependencies:
   - geopandas
   - xarray
   - asv
+  - hvplot
   - pip:
     - antimeridian
     - git+https://github.com/philipc2/pyfma.git # fix until https://github.com/nschloe/pyfma/pull/17 is merged

diff --git a/ci/environment.yml b/ci/environment.yml
@@ -8,9 +8,11 @@ dependencies:
   - dask
   - datashader
   - gmpy2
+  - geoviews
   - h5netcdf
   - hdf5
   - holoviews
+  - hvplot
   - matplotlib-base
   - matplotlib-inline
   - netcdf4

diff --git a/docs/internal_api/index.rst b/docs/internal_api/index.rst
@@ -326,8 +326,6 @@ Visualization
 .. autosummary::
    :toctree: generated/
 
-   plot.grid_plot._plot_coords_as_points
-   plot.dataarray_plot._plot_data_as_points
    plot.dataarray_plot._polygon_raster
    plot.dataarray_plot._point_raster
    plot.utils.HoloviewsBackend

diff --git a/docs/user-guide/calculus.ipynb b/docs/user-guide/calculus.ipynb
@@ -2,36 +2,39 @@
  "cells": [
   {
    "cell_type": "markdown",
+   "id": "6051044271a0d338",
+   "metadata": {
+    "collapsed": false,
+    "jupyter": {
+     "outputs_hidden": false
+    }
+   },
    "source": [
     "# Calculus Operators\n",
     "\n",
     "```{seealso}\n",
     "This section is currently under development. Please refer to the API reference for current information about supported calculus operators.\n",
     "```"
-   ],
-   "metadata": {
-    "collapsed": false
-   },
-   "id": "6051044271a0d338"
+   ]
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
-    "version": 2
+    "version": 3
    },
    "file_extension": ".py",
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython2",
-   "version": "2.7.6"
+   "pygments_lexer": "ipython3",
+   "version": "3.11.9"
   }
  },
  "nbformat": 4,