Merge branch 'master' into yge/zernike

devtools/dev-requirements_conda.yml

@@ -13,24 +13,26 @@ dependencies:
   - termcolor
   - pip
   - pip:
+    # Conda only parses a single list of pip requirements.
+    # If two pip lists are given, all but the last list is skipped.
     - interpax
     - jax[cpu] >= 0.3.2, < 0.5.0
     - nvgpu
     - plotly >= 5.16, < 6.0
     - pylatexenc >= 2.0, < 3.0
+    # building the docs
+    - sphinx-github-style >= 1.0, < 2.0
     # testing and benchmarking
     - qsc
     - qicna @ git+https://github.com/rogeriojorge/pyQIC/
 
   # building the docs
-  - nbsphinx > 0.8.5
+  - nbsphinx == 0.8.12
   - pandoc
   - sphinx > 3.0.0
   - sphinx-argparse
   - sphinx-copybutton
   - sphinx_rtd_theme >= 1.0, < 2.0
-  - pip:
-    - sphinx-github-style >= 1.0, < 2.0
 
   # linting
   - black = 24.3.0

requirements_conda.yml

@@ -2,7 +2,7 @@ name: desc-env
 dependencies:
   # standard install
   - colorama
-  - h5py >= 3.0.0
+  - h5py >= 3.0.0, < 4.0
   - matplotlib >= 3.5.0, < 4.0.0
   - mpmath >= 1.0.0, < 2.0
   - netcdf4 >= 1.5.4, < 2.0
@@ -12,6 +12,8 @@ dependencies:
   - termcolor
   - pip
   - pip:
+    # Conda only parses a single list of pip requirements.
+    # If two pip lists are given, all but the last list is skipped.
     - interpax
     - jax[cpu] >= 0.3.2, < 0.5.0
     - nvgpu