Skip to content

Commit

Permalink
Merge branch 'main' into mike/3d_xray
Browse files Browse the repository at this point in the history
  • Loading branch information
bwohlberg authored Jul 30, 2024
2 parents beba882 + a28da46 commit 5df1c75
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Version 0.0.6 (unreleased)
• Rename ``scico.flax.save_weights`` and ``scico.flax.load_weights`` to
``scico.flax.save_variables`` and ``scico.flax.load_variables``
respectively.
• Support ``jaxlib`` and ``jax`` versions 0.4.3 to 0.4.30.
• Support ``jaxlib`` and ``jax`` versions 0.4.3 to 0.4.31.
• Support ``flax`` versions 0.8.0 to 0.8.3.


Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ scipy>=1.6.0
imageio>=2.17
tifffile
matplotlib
jaxlib>=0.4.3,<=0.4.30
jax>=0.4.3,<=0.4.30
jaxlib>=0.4.3,<=0.4.31
jax>=0.4.3,<=0.4.31
orbax-checkpoint<=0.5.7
flax>=0.8.0,<=0.8.3
pyabel>=0.9.0

0 comments on commit 5df1c75

Please sign in to comment.