From e107ad6bf07588302d0bbc2709ab0f08388255d2 Mon Sep 17 00:00:00 2001 From: Peter Hill Date: Tue, 8 Apr 2025 13:23:38 +0100 Subject: [PATCH 1/7] Remove unnecessary `importlib-metadata` from requirements.txt Closes #125 --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fce5dd3..7dc8ac9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,4 @@ scipy>=1.0.0 matplotlib>=2.0.0 h5py>=2.10.0 Shapely>=1.7.1 -importlib-metadata<4.3,>=1.1.0 freeqdsk From 50192f2558b7b13907f3a93b297ebed2319cce79 Mon Sep 17 00:00:00 2001 From: Peter Hill Date: Tue, 8 Apr 2025 13:26:39 +0100 Subject: [PATCH 2/7] Bump requirements to meet SPEC 0 See https://scientific-python.org/specs/spec-0000/ --- pyproject.toml | 8 ++++---- requirements.txt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 038b155..f2fcc66 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ build-backend = "setuptools.build_meta" name = "FreeGS" description = "Free boundary Grad-Shafranov solver for tokamak plasma equilibria" readme = "README.md" -requires-python = ">=3.8" +requires-python = ">=3.10" classifiers = [ "Programming Language :: Python", "Development Status :: 3 - Alpha", @@ -25,9 +25,9 @@ license = {text = "GNU Lesser General Public License v3 or later (LGPLv3+)"} authors = [{name = "Ben Dudson", email = "benjamin.dudson@york.ac.uk"}] urls = {project = "https://github.com/freegs-plasma/freegs"} dependencies = [ - "numpy>=1.8", - "scipy>=0.14", - "matplotlib>=1.3", + "numpy>=1.25.0", + "scipy>=1.11.0", + "matplotlib>=3.8.0", "h5py>=2.10.0", "Shapely>=1.7.1", "freeqdsk>=0.1.0", diff --git a/requirements.txt b/requirements.txt index 7dc8ac9..d2edbbc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -numpy>=1.14.1 -scipy>=1.0.0 -matplotlib>=2.0.0 +numpy>=1.25.0 +scipy>=1.11.0 +matplotlib>=3.8.0 h5py>=2.10.0 Shapely>=1.7.1 -freeqdsk +freeqdsk>=0.1.0 From 455b9791c7e27ef72cc9b2d8800db16e78629830 Mon Sep 17 00:00:00 2001 From: Peter Hill Date: Tue, 8 Apr 2025 13:26:56 +0100 Subject: [PATCH 3/7] Bump build requirements --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index f2fcc66..48de6d1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] requires = [ - "setuptools >= 61.0.0", - "setuptools_scm[toml] >= 6.2", + "setuptools >= 64.0.0", + "setuptools_scm >= 8", ] build-backend = "setuptools.build_meta" From c5ce76e45107eb4479470eaf7822605afc806142 Mon Sep 17 00:00:00 2001 From: Peter Hill Date: Tue, 8 Apr 2025 13:28:12 +0100 Subject: [PATCH 4/7] Bump docs requirements --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 48de6d1..7c23519 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ tests = [ docs = [ "sphinx >= 5.3", "sphinx_autodoc_typehints >= 1.19", - "sphinx-book-theme >= 0.4.0rc1", + "sphinx-book-theme >= 1.1.0", ] [tool.setuptools] From e22bf3208e3d16257fb56e5b4055b95914c3dd36 Mon Sep 17 00:00:00 2001 From: Peter Hill Date: Tue, 8 Apr 2025 13:32:38 +0100 Subject: [PATCH 5/7] CI: Drop 3.9, add 3.13 from tests --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 486fbe2..4485628 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12"] + python-version: ["3.10", "3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v4 From 6f2a1b0b2ea1c44529f8ea9b88815f75b450434f Mon Sep 17 00:00:00 2001 From: Peter Hill Date: Tue, 8 Apr 2025 13:33:51 +0100 Subject: [PATCH 6/7] CI: Bump deprecated action --- .github/workflows/benchmark.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 34070ec..5f02b56 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -59,7 +59,7 @@ jobs: run: cp benchmarks.log .asv/results/ working-directory: ${{ env.ASV_DIR }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: always() with: name: asv-benchmark-results-${{ runner.os }} From 2de3657df94bf2c90a68d049c1ad4bd5a848a5e3 Mon Sep 17 00:00:00 2001 From: Peter Hill Date: Tue, 8 Apr 2025 13:40:45 +0100 Subject: [PATCH 7/7] Fix flake8 warning about unused `global` --- freegs/test_optimiser.py | 1 - 1 file changed, 1 deletion(-) diff --git a/freegs/test_optimiser.py b/freegs/test_optimiser.py index 3fd60d6..53f5036 100644 --- a/freegs/test_optimiser.py +++ b/freegs/test_optimiser.py @@ -130,7 +130,6 @@ def test_pick_excludes(): def monitor(generation, best, pop): global best_point global pop_points - global axis # Change the color of the previous points # to grey and light red