Skip to content

Commit

Permalink
Merge branch 'master' into rc/docs
Browse files Browse the repository at this point in the history
  • Loading branch information
f0uriest authored Mar 12, 2024
2 parents a1aba48 + ba62bb2 commit 176afa9
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/black.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Python 3.8
- name: Set up Python 3.10
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: '3.10'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
name: Linting
steps:
- uses: actions/checkout@v4
- name: Set up Python 3.9
- name: Set up Python 3.10
uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: '3.10'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mpl_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- name: Set up Python 3.10
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: '3.10'
cache: pip
- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nbtests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.9]
python-version: ['3.10']

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.9'
python-version: '3.10'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unittest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
combos: [{group: 1, python_version: '3.8'}, {group: 2, python_version: '3.9'}, {group: 3, python_version: '3.10'}, {group: 4, python_version: '3.11'}]
combos: [{group: 1, python_version: '3.9'}, {group: 2, python_version: '3.10'}, {group: 3, python_version: '3.11'}, {group: 4, python_version: '3.12'}]

steps:
- uses: actions/checkout@v4
Expand Down
8 changes: 4 additions & 4 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ In general, to install JAX with GPU support, please refer to the `JAX installati
For information on using conda, see `here <https://conda.io/projects/conda/en/latest/user-guide/getting-started.html#starting-conda>`__.
Other package managers like venv could be used instead of conda, we have just chosen conda as our package manager of choice, and only test with conda environments, so your mileage may vary with other managers.

**NOTE: DESC requires python>=3.8.**
**NOTE: DESC requires python>=3.9.**
**If you have python2 also locally installed, replace all `pip` commands with `pip3` and all `python` commands with `python3` to ensure the correct python version is used.**

On Your Local Machine
Expand Down Expand Up @@ -39,7 +39,7 @@ Option 1: Using pip to install packages (this will only install DESC + JAX with

.. code-block:: sh
conda create --name desc-env 'python>=3.8, <=3.11'
conda create --name desc-env 'python>=3.9, <=3.12'
conda activate desc-env
pip install --editable .
# optionally install developer requirements (if you want to run tests)
Expand Down Expand Up @@ -91,7 +91,7 @@ Option 1: Using pip to install packages (this will only install DESC + JAX with

.. code-block:: sh
conda create --name desc-env 'python>=3.8, <=3.11'
conda create --name desc-env 'python>=3.9, <=3.12'
conda activate desc-env
pip install --editable .
# optionally install developer requirements (if you want to run tests)
Expand Down Expand Up @@ -204,7 +204,7 @@ Commit `a2fe711ffa3f` (an older version of the `master` branch) was tested to wo
module load anaconda3/2020.11 cudatoolkit/11.1 cudnn/cuda-11.1/8.0.4
conda create --name desc-env python=3.8
conda create --name desc-env python=3.10
conda activate desc-env
# install what you can of the requirements with conda, ends up being all but jax, jaxlib and nvgpu
conda install colorama "h5py>=3.0.0" "matplotlib>=3.3.0,<=3.6.0,!=3.4.3" "mpmath>=1.0.0" "netcdf4>=1.5.4" "numpy>=1.20.0,<1.25.0" psutil "scipy>=1.5.0,<1.11.0" termcolor
Expand Down
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
"License :: OSI Approved :: MIT License",
"Natural Language :: English",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Scientific/Engineering",
"Topic :: Scientific/Engineering :: Mathematics",
"Topic :: Scientific/Engineering :: Physics",
Expand All @@ -55,7 +55,7 @@
packages=find_packages(exclude=["docs", "tests", "local", "report"]),
include_package_data=True,
install_requires=requirements,
python_requires=">=3.8",
python_requires=">=3.9",
entry_points={"console_scripts": ["desc=desc.__main__:main"]},
project_urls={
"Issues Tracker": "https://github.com/PlasmaControl/DESC/issues",
Expand Down

0 comments on commit 176afa9

Please sign in to comment.