From 53cfbd55c8bea6f0c04918be3113d9a7fbd6a643 Mon Sep 17 00:00:00 2001 From: Rory Conlin Date: Sun, 3 Mar 2024 19:08:06 -0500 Subject: [PATCH 1/3] Bump python versions --- .github/workflows/black.yml | 4 ++-- .github/workflows/linting.yml | 4 ++-- .github/workflows/mpl_tests.yml | 2 +- .github/workflows/nbtests.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/unittest.yml | 2 +- docs/installation.rst | 8 ++++---- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index cd533bfe4f..993e56ee4b 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -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 diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index baf63556bd..c3ea0f96e9 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -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 diff --git a/.github/workflows/mpl_tests.yml b/.github/workflows/mpl_tests.yml index 4a352f7dd3..b986b33ec9 100644 --- a/.github/workflows/mpl_tests.yml +++ b/.github/workflows/mpl_tests.yml @@ -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: | diff --git a/.github/workflows/nbtests.yml b/.github/workflows/nbtests.yml index 6e44b792bc..89c194cc3a 100644 --- a/.github/workflows/nbtests.yml +++ b/.github/workflows/nbtests.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.9] + python-version: ['3.10'] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eef0eccc32..2d1439cc21 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 50617f1e00..19f4eda907 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -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 diff --git a/docs/installation.rst b/docs/installation.rst index 803477f6a0..3ca7d97821 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -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 `__. 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 @@ -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>=9, <=3.12' conda activate desc-env pip install --editable . # optionally install developer requirements (if you want to run tests) @@ -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) @@ -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 From 22e926004db705aeed779c303981af7c0e9592e0 Mon Sep 17 00:00:00 2001 From: Rory Conlin Date: Sun, 3 Mar 2024 19:13:52 -0500 Subject: [PATCH 2/3] Update setup.py --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index d90222cbb7..918bc5da75 100644 --- a/setup.py +++ b/setup.py @@ -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", @@ -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", From 25c28ec08e187d8f14704ed37dcfaa2362e9546c Mon Sep 17 00:00:00 2001 From: Rory Conlin Date: Mon, 11 Mar 2024 19:41:31 -0400 Subject: [PATCH 3/3] Fix typo --- docs/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation.rst b/docs/installation.rst index 3ca7d97821..67a2988048 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -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>=9, <=3.12' + 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)