diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst index b3d6f917..6b080e30 100644 --- a/docs/source/contributing.rst +++ b/docs/source/contributing.rst @@ -30,7 +30,7 @@ Installing a Development Version :: - conda create -n scico python=3.11 + conda create -n scico python=3.12 5. Activate the created conda virtual environment: diff --git a/docs/source/install.rst b/docs/source/install.rst index b6698ae5..0931ef82 100644 --- a/docs/source/install.rst +++ b/docs/source/install.rst @@ -3,10 +3,10 @@ Installing SCICO ================ -SCICO requires Python version 3.8 or later. (Version 3.10 is -recommended as it is the version under which SCICO has been most -thoroughly tested, and is the minimum supported Python version for -the most recent versions of JAX.) SCICO is supported on both Linux and +SCICO requires Python version 3.8 or later. (Version 3.12 is +recommended as it is the version under which SCICO is tested in GitHub +continuous integration, and since the most recent versions of JAX require +version 3.10 or later.) SCICO is supported on both Linux and MacOS, but is not currently supported on Windows due to the limited support for ``jaxlib`` on Windows. However, Windows users can use SCICO via the `Windows Subsystem for Linux diff --git a/misc/conda/README.rst b/misc/conda/README.rst index f1cd68e1..9df4e6c5 100644 --- a/misc/conda/README.rst +++ b/misc/conda/README.rst @@ -19,11 +19,11 @@ To install miniconda in ``/opt/conda`` do ./install_conda.sh -y /opt/conda -To create a conda environment called ``py310`` with default Python version (3.10) and without GPU support +To create a conda environment called ``scico`` with Python version 3.12 and without GPU support :: - ./make_conda_env.sh -y -e py310 + ./make_conda_env.sh -y -p 3.12 -e scico To include GPU support, follow the `jax installation instructions `__ after diff --git a/misc/conda/make_conda_env.sh b/misc/conda/make_conda_env.sh index d3b99d46..b5aa4411 100755 --- a/misc/conda/make_conda_env.sh +++ b/misc/conda/make_conda_env.sh @@ -28,7 +28,7 @@ Usage: $SCRIPT [-h] [-y] [-g] [-p python_version] [-e env_name] [-v] Verbose operation [-t] Display actions that would be taken but do nothing [-y] Do not ask for confirmation - [-p python_version] Specify Python version (e.g. 3.10) + [-p python_version] Specify Python version (e.g. 3.12) [-e env_name] Specify conda environment name EOF ) @@ -36,7 +36,7 @@ EOF AGREE=no VERBOSE=no TEST=no -PYVER="3.10" +PYVER="3.12" ENVNM=py$(echo $PYVER | sed -e 's/\.//g') # Project requirements files