Merge branch 'main' into autoapi

* main: updated conda lock files (bjlittle#613) add sphinx-autoapi dependency (bjlittle#614) nep29 drop numpy 1.22 (bjlittle#612)
tkknight · Jan 2, 2024 · 7f3f354 · 7f3f354
2 parents 7dc2566 + e651270
commit 7f3f354
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 27 deletions.
diff --git a/requirements/geovista.yml b/requirements/geovista.yml
@@ -13,7 +13,7 @@ dependencies:
   - cartopy >=0.22
   - click
   - click-default-group
-  - numpy >1.21
+  - numpy >=1.23
   - platformdirs
   - pooch
   - pykdtree
@@ -48,7 +48,7 @@ dependencies:
   - jupyter_sphinx
   - pydata-sphinx-theme
   - sphinx
-  - sphinxcontrib-apidoc  
+  - sphinx-autoapi
   - sphinx-book-theme
   - sphinx-copybutton
   - sphinx-design

diff --git a/requirements/locks/py310-lock-linux-64.txt b/requirements/locks/py310-lock-linux-64.txt
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 5cb164bc762f9920c42d2a17fc23bf42244830b60de60cc3673a1b6d492f5f34
+# input_hash: d726851e8e44850bbd02fccf4cd5c9aa5e9f63ce369c88047956ae96affaf70d
 @EXPLICIT
 https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2#d7c89558ba9fa0495403155b64376d81
 https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2023.11.17-hbcca054_0.conda#01ffc8d36f9eba0ce0b3c1955fa780ee
@@ -13,7 +13,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-13.2.0-h7e041cc_3.c
 https://conda.anaconda.org/conda-forge/linux-64/nlohmann_json-3.11.2-h27087fc_0.tar.bz2#b7743cf3f8da023abe95afc215111555
 https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.10-4_cp310.conda#26322ec5d7712c3ded99dd656142b8ce
 https://conda.anaconda.org/conda-forge/noarch/tzdata-2023d-h0c530f3_0.conda#8dee24b8be2d9ff81e7bd4d7d97ff1b0
-https://conda.anaconda.org/conda-forge/linux-64/utfcpp-4.0.4-ha770c72_0.conda#fe0aa3ea88da0546dd903bbed6629f0a
+https://conda.anaconda.org/conda-forge/linux-64/utfcpp-4.0.5-ha770c72_0.conda#25965c1d1d5fc00ce2b663b73008e3b7
 https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2#f766549260d6815b0c52253f1fb1bb29
 https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h807b86a_3.conda#7124cbb46b13d395bdde68f2d215c989
 https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2#73aaf86a425cc6e73fcf236a5a46396d
@@ -137,6 +137,7 @@ https://conda.anaconda.org/conda-forge/linux-64/xcb-util-renderutil-0.3.9-hd5903
 https://conda.anaconda.org/conda-forge/linux-64/xcb-util-wm-0.4.1-h8ee46fc_1.conda#90108a432fb5c6150ccfee3f03388656
 https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.8.7-h8ee46fc_0.conda#49e482d882669206653b095f5206c05b
 https://conda.anaconda.org/conda-forge/noarch/alabaster-0.7.13-pyhd8ed1ab_0.conda#06006184e203b61d3525f90de394471e
+https://conda.anaconda.org/conda-forge/noarch/anyascii-0.3.2-pyhd8ed1ab_0.conda#70b6fc71d80ea6176f5302ebbeb13d8a
 https://conda.anaconda.org/conda-forge/noarch/attrs-23.2.0-pyh71513ae_0.conda#5e4c0743c70186509d1412e03c2d8dfa
 https://conda.anaconda.org/conda-forge/linux-64/brotli-1.1.0-hd590300_1.conda#f27a24d46e3ea7b70a1f98e50c62508f
 https://conda.anaconda.org/conda-forge/linux-64/brotli-python-1.1.0-py310hc6cd4ac_1.conda#1f95722c94f00b69af69a066c7433714
@@ -259,7 +260,7 @@ https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-7.0.1-pyha770c7
 https://conda.anaconda.org/conda-forge/noarch/importlib_resources-6.1.1-pyhd8ed1ab_0.conda#3d5fa25cf42f3f32a12b2d874ace8574
 https://conda.anaconda.org/conda-forge/noarch/jedi-0.19.1-pyhd8ed1ab_0.conda#81a3be0b2023e1ea8555781f0ad904a2
 https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37
-https://conda.anaconda.org/conda-forge/linux-64/jupyter_core-5.6.0-py310hff52083_0.conda#03990ac4430494d72e33d54bb8658e19
+https://conda.anaconda.org/conda-forge/linux-64/jupyter_core-5.6.1-py310hff52083_0.conda#31baaf24ca9e95ab70ec7c7b6fc9771c
 https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.3.0-pyhd8ed1ab_0.conda#3f0915b1fb2252ab73686a533c5f9d3f
 https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-20_linux64_openblas.conda#36d486d72ab64ffea932329a1d3729a3
 https://conda.anaconda.org/conda-forge/linux-64/libclang-15.0.7-default_hb11cfb5_4.conda#c90f4cbb57839c98fef8f830e4b9972f
@@ -299,6 +300,7 @@ https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.25.0-pyhd8ed1ab_0.co
 https://conda.anaconda.org/conda-forge/linux-64/yarl-1.9.3-py310h2372a71_0.conda#10246f66639d9ca55e790410f0dbb465
 https://conda.anaconda.org/conda-forge/linux-64/argon2-cffi-bindings-21.2.0-py310h2372a71_4.conda#68ee85860502d53c8cbfa0e4cef0f6cb
 https://conda.anaconda.org/conda-forge/noarch/arrow-1.3.0-pyhd8ed1ab_0.conda#b77d8c2313158e6e461ca0efb1c2c508
+https://conda.anaconda.org/conda-forge/linux-64/astroid-3.0.2-py310hff52083_0.conda#538a51aada7f8e35bb0dd1fcb61168a8
 https://conda.anaconda.org/conda-forge/noarch/async-timeout-4.0.3-pyhd8ed1ab_0.conda#3ce482ec3066e6d809dbbb1d1679f215
 https://conda.anaconda.org/conda-forge/noarch/fqdn-1.5.1-pyhd8ed1ab_0.tar.bz2#642d35437078749ef23a5dca2c9bb1f3
 https://conda.anaconda.org/conda-forge/linux-64/glew-2.1.0-h9c3ff4c_2.tar.bz2#fb05eb5c47590b247658243d27fc32f1
@@ -353,20 +355,21 @@ https://conda.anaconda.org/conda-forge/noarch/cmocean-3.0.3-pyhd8ed1ab_0.conda#e
 https://conda.anaconda.org/conda-forge/noarch/jupyter_events-0.9.0-pyhd8ed1ab_0.conda#00ba25993f0dba38cf72a7224e33289f
 https://conda.anaconda.org/conda-forge/noarch/nbclient-0.8.0-pyhd8ed1ab_0.conda#e78da91cf428faaf05701ce8cc8f2f9b
 https://conda.anaconda.org/conda-forge/noarch/trame-rca-0.4.1-pyhd8ed1ab_0.conda#40f0f7a8bae0e415e967b8639262866d
-https://conda.anaconda.org/conda-forge/noarch/trame-server-2.13.1-pyhd8ed1ab_0.conda#09f40f2d5f259bd24ebc6569f8566e68
+https://conda.anaconda.org/conda-forge/noarch/trame-server-2.14.0-pyhd8ed1ab_0.conda#78f2d480c08b9b60ef6ef02988f3d43f
 https://conda.anaconda.org/conda-forge/linux-64/vtk-base-9.2.6-qt_py310h1234567_220.conda#665737e30e12e5c1e20a8a3426df73f2
-https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.13.1-pyhd8ed1ab_0.conda#165cac4486f9e8542f0b8de32822f328
-https://conda.anaconda.org/conda-forge/noarch/trame-3.4.0-pyhd8ed1ab_0.conda#9849a79b88a376ffa2c2700114c275ad
+https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.14.0-pyhd8ed1ab_0.conda#bf099b894a9fd1dc65c881940a2f4e69
+https://conda.anaconda.org/conda-forge/noarch/trame-3.5.0-pyhd8ed1ab_0.conda#573d11cd23e4e5b1a6070724bc3c94dc
 https://conda.anaconda.org/conda-forge/linux-64/vtk-io-ffmpeg-9.2.6-qt_py310h1234567_220.conda#5611464975f4d2bd8c5beeab80ead9a0
 https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.12.1-pyhd8ed1ab_0.conda#e9781be1e6c93b5df2c180a9f9242420
-https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.13.1-pyhd8ed1ab_0.conda#b97a845d8ee2502842873e7e9d59eb97
+https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.14.0-pyhd8ed1ab_0.conda#fe3613d8ff5d0553ae7097ffcd364fdd
 https://conda.anaconda.org/conda-forge/linux-64/vtk-9.2.6-qt_py310h1234567_220.conda#1c1089c9dc15089da0b1b3a24dff32d1
 https://conda.anaconda.org/conda-forge/noarch/jupyter-server-proxy-4.1.0-pyhd8ed1ab_0.conda#b404b1dc6ca2bbb66663507150cb6927
-https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.13.1-pyhd8ed1ab_0.conda#ee7bb8530ad5bda21f34ec6b16d218fc
+https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.14.0-pyhd8ed1ab_0.conda#c48d304428e46ec8d597fd483256e74f
 https://conda.anaconda.org/conda-forge/noarch/pyvista-0.42.1-pyhd8ed1ab_0.conda#f4d742ff3e10974ac1281619d2417c6b
 https://conda.anaconda.org/conda-forge/noarch/pytest-pyvista-0.1.9-pyhd8ed1ab_0.conda#a17efbdb0e52ac37d2b0472146ba8e84
 https://conda.anaconda.org/conda-forge/linux-64/jupyter_sphinx-0.4.0-py310hff52083_3.conda#65e621e394051c5856d998c28eb0565d
 https://conda.anaconda.org/conda-forge/noarch/pydata-sphinx-theme-0.14.4-pyhd8ed1ab_0.conda#c79b8443908032263ffb40ee6215e9e4
+https://conda.anaconda.org/conda-forge/noarch/sphinx-autoapi-3.0.0-pyhd8ed1ab_0.conda#736b53813c2b9582b1345462d8ca66e7
 https://conda.anaconda.org/conda-forge/noarch/sphinx-book-theme-1.1.0-pyhd8ed1ab_0.conda#8aa3adad1c29950e7eec88b3bb4ccd41
 https://conda.anaconda.org/conda-forge/noarch/sphinx-copybutton-0.5.2-pyhd8ed1ab_0.conda#ac832cc43adc79118cf6e23f1f9b8995
 https://conda.anaconda.org/conda-forge/noarch/sphinx-design-0.5.0-pyhd8ed1ab_0.conda#264b3c697fa9cdade87eb0abe4440d54

diff --git a/requirements/locks/py311-lock-linux-64.txt b/requirements/locks/py311-lock-linux-64.txt
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 6d8e958e277b126f847e6a21c8f42eaed0696b599a4011eb343c5b2478ed1745
+# input_hash: 40087b8e465e4addc773b77ad790d6667629bc6439728c8159f9257d320cbd95
 @EXPLICIT
 https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2#d7c89558ba9fa0495403155b64376d81
 https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2023.11.17-hbcca054_0.conda#01ffc8d36f9eba0ce0b3c1955fa780ee
@@ -13,7 +13,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-13.2.0-h7e041cc_3.c
 https://conda.anaconda.org/conda-forge/linux-64/nlohmann_json-3.11.2-h27087fc_0.tar.bz2#b7743cf3f8da023abe95afc215111555
 https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.11-4_cp311.conda#d786502c97404c94d7d58d258a445a65
 https://conda.anaconda.org/conda-forge/noarch/tzdata-2023d-h0c530f3_0.conda#8dee24b8be2d9ff81e7bd4d7d97ff1b0
-https://conda.anaconda.org/conda-forge/linux-64/utfcpp-4.0.4-ha770c72_0.conda#fe0aa3ea88da0546dd903bbed6629f0a
+https://conda.anaconda.org/conda-forge/linux-64/utfcpp-4.0.5-ha770c72_0.conda#25965c1d1d5fc00ce2b663b73008e3b7
 https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2#f766549260d6815b0c52253f1fb1bb29
 https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h807b86a_3.conda#7124cbb46b13d395bdde68f2d215c989
 https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2#73aaf86a425cc6e73fcf236a5a46396d
@@ -137,6 +137,8 @@ https://conda.anaconda.org/conda-forge/linux-64/xcb-util-renderutil-0.3.9-hd5903
 https://conda.anaconda.org/conda-forge/linux-64/xcb-util-wm-0.4.1-h8ee46fc_1.conda#90108a432fb5c6150ccfee3f03388656
 https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.8.7-h8ee46fc_0.conda#49e482d882669206653b095f5206c05b
 https://conda.anaconda.org/conda-forge/noarch/alabaster-0.7.13-pyhd8ed1ab_0.conda#06006184e203b61d3525f90de394471e
+https://conda.anaconda.org/conda-forge/noarch/anyascii-0.3.2-pyhd8ed1ab_0.conda#70b6fc71d80ea6176f5302ebbeb13d8a
+https://conda.anaconda.org/conda-forge/linux-64/astroid-3.0.2-py311h38be061_0.conda#f8811b77ac1d389d28f8fb4960eee238
 https://conda.anaconda.org/conda-forge/noarch/attrs-23.2.0-pyh71513ae_0.conda#5e4c0743c70186509d1412e03c2d8dfa
 https://conda.anaconda.org/conda-forge/linux-64/brotli-1.1.0-hd590300_1.conda#f27a24d46e3ea7b70a1f98e50c62508f
 https://conda.anaconda.org/conda-forge/linux-64/brotli-python-1.1.0-py311hb755f60_1.conda#cce9e7c3f1c307f2a5fb08a2922d6164
@@ -258,7 +260,7 @@ https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-7.0.1-pyha770c7
 https://conda.anaconda.org/conda-forge/noarch/importlib_resources-6.1.1-pyhd8ed1ab_0.conda#3d5fa25cf42f3f32a12b2d874ace8574
 https://conda.anaconda.org/conda-forge/noarch/jedi-0.19.1-pyhd8ed1ab_0.conda#81a3be0b2023e1ea8555781f0ad904a2
 https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37
-https://conda.anaconda.org/conda-forge/linux-64/jupyter_core-5.6.0-py311h38be061_0.conda#20290b0ac04a80c0d84d833fff1c0fd7
+https://conda.anaconda.org/conda-forge/linux-64/jupyter_core-5.6.1-py311h38be061_0.conda#ae517e16e9ac95dfc2e56aeac9aa0739
 https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.3.0-pyhd8ed1ab_0.conda#3f0915b1fb2252ab73686a533c5f9d3f
 https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-20_linux64_openblas.conda#36d486d72ab64ffea932329a1d3729a3
 https://conda.anaconda.org/conda-forge/linux-64/libclang-15.0.7-default_hb11cfb5_4.conda#c90f4cbb57839c98fef8f830e4b9972f
@@ -347,24 +349,25 @@ https://conda.anaconda.org/conda-forge/linux-64/netcdf4-1.6.5-nompi_py311he8ad70
 https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.6.0-pyha770c72_0.conda#473a7cfca197da0a10cff3f6dded7d4b
 https://conda.anaconda.org/conda-forge/linux-64/qt-main-5.15.8-h82b777d_17.conda#4f01e33dbb406085a16a2813ab067e95
 https://conda.anaconda.org/conda-forge/noarch/trame-rca-0.4.1-pyhd8ed1ab_0.conda#40f0f7a8bae0e415e967b8639262866d
-https://conda.anaconda.org/conda-forge/noarch/trame-server-2.13.1-pyhd8ed1ab_0.conda#09f40f2d5f259bd24ebc6569f8566e68
+https://conda.anaconda.org/conda-forge/noarch/trame-server-2.14.0-pyhd8ed1ab_0.conda#78f2d480c08b9b60ef6ef02988f3d43f
 https://conda.anaconda.org/conda-forge/linux-64/cartopy-0.22.0-py311h320fe9a_1.conda#10d1806e20da040c58c36deddf51c70c
 https://conda.anaconda.org/conda-forge/noarch/cmocean-3.0.3-pyhd8ed1ab_0.conda#eec7df83d725696d32c7bf99aff21d82
 https://conda.anaconda.org/conda-forge/noarch/jupyter_events-0.9.0-pyhd8ed1ab_0.conda#00ba25993f0dba38cf72a7224e33289f
 https://conda.anaconda.org/conda-forge/noarch/nbclient-0.8.0-pyhd8ed1ab_0.conda#e78da91cf428faaf05701ce8cc8f2f9b
-https://conda.anaconda.org/conda-forge/noarch/trame-3.4.0-pyhd8ed1ab_0.conda#9849a79b88a376ffa2c2700114c275ad
+https://conda.anaconda.org/conda-forge/noarch/trame-3.5.0-pyhd8ed1ab_0.conda#573d11cd23e4e5b1a6070724bc3c94dc
 https://conda.anaconda.org/conda-forge/linux-64/vtk-base-9.2.6-qt_py311h1234567_220.conda#bbfafb0cc0483c89ea2289381dc157a5
-https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.13.1-pyhd8ed1ab_0.conda#165cac4486f9e8542f0b8de32822f328
+https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.14.0-pyhd8ed1ab_0.conda#bf099b894a9fd1dc65c881940a2f4e69
 https://conda.anaconda.org/conda-forge/linux-64/vtk-io-ffmpeg-9.2.6-qt_py311h1234567_220.conda#0e894286dd36bdc569d7fd4e8033f8d9
 https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.12.1-pyhd8ed1ab_0.conda#e9781be1e6c93b5df2c180a9f9242420
-https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.13.1-pyhd8ed1ab_0.conda#b97a845d8ee2502842873e7e9d59eb97
+https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.14.0-pyhd8ed1ab_0.conda#fe3613d8ff5d0553ae7097ffcd364fdd
 https://conda.anaconda.org/conda-forge/linux-64/vtk-9.2.6-qt_py311h1234567_220.conda#bd6689b3212fc662bd6cbc57e29ec0dc
 https://conda.anaconda.org/conda-forge/noarch/jupyter-server-proxy-4.1.0-pyhd8ed1ab_0.conda#b404b1dc6ca2bbb66663507150cb6927
-https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.13.1-pyhd8ed1ab_0.conda#ee7bb8530ad5bda21f34ec6b16d218fc
+https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.14.0-pyhd8ed1ab_0.conda#c48d304428e46ec8d597fd483256e74f
 https://conda.anaconda.org/conda-forge/noarch/pyvista-0.42.1-pyhd8ed1ab_0.conda#f4d742ff3e10974ac1281619d2417c6b
 https://conda.anaconda.org/conda-forge/noarch/pytest-pyvista-0.1.9-pyhd8ed1ab_0.conda#a17efbdb0e52ac37d2b0472146ba8e84
 https://conda.anaconda.org/conda-forge/linux-64/jupyter_sphinx-0.4.0-py311h38be061_3.conda#308670d0edc11817559ffe27d0eff27c
 https://conda.anaconda.org/conda-forge/noarch/pydata-sphinx-theme-0.14.4-pyhd8ed1ab_0.conda#c79b8443908032263ffb40ee6215e9e4
+https://conda.anaconda.org/conda-forge/noarch/sphinx-autoapi-3.0.0-pyhd8ed1ab_0.conda#736b53813c2b9582b1345462d8ca66e7
 https://conda.anaconda.org/conda-forge/noarch/sphinx-book-theme-1.1.0-pyhd8ed1ab_0.conda#8aa3adad1c29950e7eec88b3bb4ccd41
 https://conda.anaconda.org/conda-forge/noarch/sphinx-copybutton-0.5.2-pyhd8ed1ab_0.conda#ac832cc43adc79118cf6e23f1f9b8995
 https://conda.anaconda.org/conda-forge/noarch/sphinx-design-0.5.0-pyhd8ed1ab_0.conda#264b3c697fa9cdade87eb0abe4440d54