Merge remote-tracking branch 'upstream/main' into apidoc_improvements

* upstream/main:
  Two negating pins for dependencies - libnetcdf and numpy (SciTools#5274)
  [pre-commit.ci] pre-commit autoupdate (SciTools#5275)
  updated installing instructions to use pip (SciTools#5273)
  remove sphinx-panel config as now longer needed (SciTools#5272)

.pre-commit-config.yaml

@@ -29,7 +29,7 @@ repos:
     -   id: no-commit-to-branch
 
 -   repo: https://github.com/codespell-project/codespell
-    rev: "v2.2.2"
+    rev: "v2.2.4"
     hooks:
     -   id: codespell
         types_or: [asciidoc, python, markdown, rst]

docs/src/conf.py

@@ -169,10 +169,6 @@ def _dotv(version):
     extensions.extend(["sphinxcontrib.apidoc"])
     extensions.extend(["api_rst_formatting"])
 
-# -- panels extension ---------------------------------------------------------
-# See https://sphinx-panels.readthedocs.io/en/latest/
-panels_add_bootstrap_css = False
-
 # -- Napoleon extension -------------------------------------------------------
 # See https://sphinxcontrib-napoleon.readthedocs.io/en/latest/sphinxcontrib.napoleon.html
 napoleon_google_docstring = True

docs/src/installing.rst

@@ -107,10 +107,10 @@ all the packages from the `testing` and `documentation` sections.
 
 .. _requirements: https://github.com/scitools/iris/tree/main/requirements
 
-Finally you need to run the command to configure your shell environment
-to find your local Iris code::
+Finally you need to run the command to configure your environment
+to find your local Iris code.  From your Iris directory run::
 
-  python setup.py develop
+  pip install --no-deps --editable .
 
 
 Running the Tests

docs/src/whatsnew/latest.rst

@@ -67,7 +67,10 @@ This document explains the changes made to Iris for this release
    3.11. (:pull:`5226`)
 
 #. `@rcomer`_ dropped support for python 3.8, in accordance with the NEP29_
-   recommendations (:pull:`5226`) 
+   recommendations (:pull:`5226`)
+
+#. `@trexfeathers`_ introduced the ``libnetcdf !=4.9.1`` and ``numpy !=1.24.3``
+   pins (:pull:`5274`)
 
 
 📚 Documentation
@@ -80,6 +83,9 @@ This document explains the changes made to Iris for this release
    ``livehtml`` to auto generate the documentation when changes are detected
    during development. (:pull:`5258`)
 
+#. `@tkknight`_ updated the :ref:`installing_from_source` instructions to use
+   ``pip``.  (:pull:`5273`)
+
 #. `@tkknight`_ removed the legacy custom sphinx extensions that generate the
    API documentation.  Instead use a less complex approach via
    `sphinx-apidoc`_. (:pull:`5264`)

requirements/py310.yml

@@ -15,10 +15,10 @@ dependencies:
   - cf-units >=3.1
   - cftime >=1.5
   - dask-core >=2022.9.0
-  - libnetcdf <4.9
+  - libnetcdf !=4.9.1
   - matplotlib >=3.5
   - netcdf4
-  - numpy >=1.19
+  - numpy >=1.21, !=1.24.3
   - python-xxhash
   - pyproj
   - scipy

requirements/py311.yml

@@ -15,10 +15,10 @@ dependencies:
   - cf-units >=3.1
   - cftime >=1.5
   - dask-core >=2022.9.0
-  - libnetcdf <4.9
+  - libnetcdf !=4.9.1
   - matplotlib >=3.5
   - netcdf4
-  - numpy >=1.19
+  - numpy >=1.21, !=1.24.3
   - python-xxhash
   - pyproj
   - scipy

requirements/py39.yml

@@ -15,10 +15,10 @@ dependencies:
   - cf-units >=3.1
   - cftime >=1.5
   - dask-core >=2022.9.0
-  - libnetcdf <4.9
+  - libnetcdf !=4.9.1
   - matplotlib >=3.5
   - netcdf4
-  - numpy >=1.19
+  - numpy >=1.21, !=1.24.3
   - python-xxhash
   - pyproj
   - scipy

requirements/pypi-core.txt

@@ -2,10 +2,10 @@ cartopy>=0.21
 cf-units>=3.1
 cftime>=1.5.0
 dask[array]>=2022.9.0
-# libnetcdf<4.9 (not available on PyPI)
+# libnetcdf!=4.9.1 (not available on PyPI)
 matplotlib>=3.5
 netcdf4
-numpy>=1.19
+numpy>=1.21,!=1.24.3
 pyproj
 scipy
 shapely!=1.8.3