Skip to content

Commit f708da7

Browse files
committed
Merge branch 'compat-jax-0.5.0' into upgrade-variable
2 parents 227e319 + 6672ea0 commit f708da7

File tree

3 files changed

+44
-17
lines changed

3 files changed

+44
-17
lines changed

Diff for: .github/workflows/CI.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ jobs:
7979
if [ -f requirements-dev.txt ]; then pip install -r requirements-dev.txt; fi
8080
pip uninstall brainpy -y
8181
python setup.py install
82-
pip install jax==0.4.30
83-
pip install jaxlib==0.4.30
82+
# pip install jax==0.4.30
83+
# pip install jaxlib==0.4.30
8484
- name: Test with pytest
8585
run: |
8686
cd brainpy

Diff for: brainpy/_src/dyn/others/tests/test_noise_groups.py

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
import brainpy as bp
55
import brainpy.math as bm
66
from absl.testing import parameterized
7+
import pytest
8+
9+
pytest.skip("Skip the test due to the jax 0.5.0 version", allow_module_level=True)
710

811

912
class Test_Noise_Group(parameterized.TestCase):

Diff for: requirements-dev.txt

+39-15
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,42 @@
11
numpy
22
jax
33
jaxlib
4-
matplotlib
5-
msgpack
6-
tqdm
7-
pathos
8-
braintaichi
9-
numba
10-
brainstate
11-
brainunit
12-
braintools
13-
setuptools
14-
15-
16-
# test requirements
17-
pytest
18-
absl-py
4+
absl-py<=2.1.0
5+
brainstate<=0.1.0.post20241210
6+
braintaichi<=0.0.4
7+
braintools<=0.0.4.post20241215
8+
brainunit<=0.0.4
9+
colorama<=0.4.6
10+
contourpy<=1.3.1
11+
cycler<=0.12.1
12+
dill<=0.3.9
13+
fonttools<=4.55.3
14+
iniconfig<=2.0.0
15+
kiwisolver<=1.4.7
16+
llvmlite<=0.43.0
17+
markdown-it-py<=3.0.0
18+
matplotlib<=3.10.0
19+
mdurl<=0.1.2
20+
ml_dtypes<=0.5.0
21+
msgpack<=1.1.0
22+
multiprocess<=0.70.17
23+
numba<=0.60.0
24+
numpy<=2.0.2
25+
opt_einsum<=3.4.0
26+
packaging<=24.2
27+
pathos<=0.3.3
28+
pillow<=11.0.0
29+
pluggy<=1.5.0
30+
pox<=0.3.5
31+
ppft<=1.7.6.9
32+
pygments<=2.18.0
33+
pyparsing<=3.2.0
34+
pytest<=8.3.4
35+
python-dateutil<=2.9.0.post0
36+
rich<=13.9.4
37+
scipy<=1.14.1
38+
setuptools<=75.6.0
39+
six<=1.17.0
40+
taichi<=1.7.2
41+
tqdm<=4.67.1
42+
typing-extensions<=4.12.2

0 commit comments

Comments
 (0)