Merge branch 'master' into yge/fix-unit

PlasmaControl · Dec 12, 2024 · 4001b97 · 4001b97
2 parents bcc791b + 4ed87cb
commit 4001b97
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/jax_tests.yml b/.github/workflows/jax_tests.yml
@@ -15,10 +15,11 @@ jobs:
         jax-version: [0.4.12, 0.4.13, 0.4.14, 0.4.16, 0.4.17,
                       0.4.18, 0.4.19, 0.4.20, 0.4.21, 0.4.22, 0.4.23,
                       0.4.24, 0.4.25, 0.4.26, 0.4.27, 0.4.28, 0.4.29,
-                      0.4.30, 0.4.31, 0.4.33, 0.4.34, 0.4.35]
+                      0.4.30, 0.4.31, 0.4.33, 0.4.34, 0.4.35, 0.4.37]
                       # 0.4.32 is not available on PyPI
                       # earlier jax versions are not compatible with other
                       # dependencies as of 2024-10-04
+                      # 0.4.36 has a bug that causes tests to fail
         group: [1, 2]
     steps:
       - uses: actions/checkout@v4
@@ -44,7 +45,6 @@ jobs:
         run: |
           pwd
           lscpu
-          pip list
           python -m pytest -m unit \
             --durations=0 \
             --mpl \

diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
-jax >= 0.4.24, <= 0.4.35
+jax >= 0.4.24, != 0.4.36, <= 0.4.37
 colorama <= 0.4.6
-diffrax >= 0.4.1, <= 0.6.0
+diffrax >= 0.4.1, <= 0.6.1
 h5py >= 3.0.0, <= 3.12.1
 interpax >= 0.3.3, <= 0.3.4
 matplotlib >= 3.5.0, <= 3.9.3