Skip to content

Commit

Permalink
Update default Python version
Browse files Browse the repository at this point in the history
  • Loading branch information
lbianchi-lbl committed Mar 13, 2024
1 parent 02d6dff commit 658d4a6
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ defaults:
env:
FOQUS_CONDA_ENV_NAME_DEV: ccsi-foqus-dev
PYTEST_BASETEMP: .pytest
DEFAULT_PYTHON_VERSION: '3.10'

jobs:
code-formatting:
Expand All @@ -34,8 +35,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.8'
- name: Install Black
# unlike the other jobs, we don't need to install FOQUS and/or all the dev dependencies,
# but we still want to specify the Black version to use in requirements-dev.txt for local development
Expand Down Expand Up @@ -84,9 +83,9 @@ jobs:
os-version: ubuntu-20.04
- os: win64
os-version: windows-2019
- python-version: "3.8" # avoid uploading coverage for full matrix
- python-version: ${{ env.DEFAULT_PYTHON_VERSION }} # avoid uploading coverage for full matrix
use_coverage: true
- python-version: "3.8" # this is to avoid installing optional dependencies in all environments
- python-version: ${{ env.DEFAULT_PYTHON_VERSION }} # this is to avoid installing optional dependencies in all environments
optional-dependencies: tensorflow sympy torch scikit-learn smt
env:
# uncomment this to debug Qt initialization errors
Expand Down
2 changes: 1 addition & 1 deletion docs/source/chapt_dev/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ will need a copy of the source to work with. Here is rough set of steps to get s

- In a terminal create a conda env in which to work::

conda create --name ccsi-foqus -c conda-forge python=3.8 pywin32=306
conda create --name ccsi-foqus -c conda-forge python=3.10 pywin32=306
conda activate ccsi-foqus

- In a terminal, get the FOQUS source::
Expand Down
2 changes: 1 addition & 1 deletion docs/source/chapt_install/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ FOQUS:

- In a terminal, to setup and install::
conda create --name ccsi-foqus -c conda-forge python=3.8 pywin32=306
conda create --name ccsi-foqus -c conda-forge python=3.10 pywin32=306
conda activate ccsi-foqus
pip install ccsi-foqus
foqus --make-shortcut # Create Desktop shortcut (Windows only)
Expand Down
6 changes: 3 additions & 3 deletions docs/source/chapt_install/install_python.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Install Python
--------------

Python version 3.8 up through 3.9 is required to run FOQUS.
Python version 3.8 up through 3.12 is required to run FOQUS.

We recommend using either the `Miniconda <https://docs.conda.io/en/latest/miniconda.html>`_ or
`Anaconda <https://www.anaconda.com/download/>`_ Python distribution and package management
Expand All @@ -17,7 +17,7 @@ ability to create self-contained python environments without any need for admini
privileges. These separate environments can have different set of packages, isolating version
dependencies when working with multiple python projects.

If you have a working version of Python 3.7 through 3.9, which you prefer over Anaconda, you can
If you have a working version of Python 3.8 through 3.12, which you prefer over Anaconda, you can
skip these steps.

Anaconda or Miniconda Install and Setup
Expand All @@ -37,7 +37,7 @@ Anaconda or Miniconda Install and Setup
after the ``--name`` flag in the below command. In a terminal (or on Windows in the Anaconda
Prompt) type::

conda create --name ccsi-foqus -c conda-forge python=3.8 pywin32=306
conda create --name ccsi-foqus -c conda-forge python=3.12 pywin32=306

Then follow the prompts. This will create a new conda environment with a minimal set of
packages. To use a different version of python, change the version specified after ``python=`` in
Expand Down

0 comments on commit 658d4a6

Please sign in to comment.