Merge branch 'master' into dp/laplace

PlasmaControl · Dec 9, 2024 · 1710819 · 1710819
2 parents 17f9aba + 8af856d
commit 1710819
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/devtools/dev-requirements_conda.yml b/devtools/dev-requirements_conda.yml
@@ -15,7 +15,7 @@ dependencies:
   - pip:
     # Conda only parses a single list of pip requirements.
     # If two pip lists are given, all but the last list is skipped.
-    - jax >= 0.4.24, < 0.5.0
+    - jax >= 0.4.24, <= 0.4.35
     - diffrax >= 0.4.1
     - interpax >= 0.3.3
     - nvgpu

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-jax >= 0.4.24, < 0.5.0
+jax >= 0.4.24, <= 0.4.35
 colorama
 diffrax >= 0.4.1
 h5py >= 3.0.0, < 4.0

diff --git a/requirements_conda.yml b/requirements_conda.yml
@@ -15,7 +15,7 @@ dependencies:
   - pip:
     # Conda only parses a single list of pip requirements.
     # If two pip lists are given, all but the last list is skipped.
-    - jax >= 0.4.24, < 0.5.0
+    - jax >= 0.4.24, <= 0.4.35
     - interpax >= 0.3.3
     - nvgpu
     - orthax