Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion freegs/test_optimiser.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[build-system]
requires = [
"setuptools >= 61.0.0",
"setuptools_scm[toml] >= 6.2",
"setuptools >= 64.0.0",
"setuptools_scm >= 8",
]
build-backend = "setuptools.build_meta"

[project]
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",
Expand All @@ -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",
Expand All @@ -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]
Expand Down
9 changes: 4 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +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
importlib-metadata<4.3,>=1.1.0
freeqdsk
freeqdsk>=0.1.0
Loading