Merge pull request #32 from boutproject/modernise-packaging

Modernise packaging

.github/workflows/black-fix.yml

@@ -11,12 +11,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         ref: ${{ github.head_ref }}
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
 

.github/workflows/python_publish.yml

@@ -8,9 +8,9 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
       - name: Install dependencies

.github/workflows/test-python-package.yml

@@ -11,19 +11,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ["3.10", "3.11", "3.12"]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install flake8 pytest
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+        python -m pip install flake8
+        python -m pip install .[tests]
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names

pyproject.toml

@@ -1,12 +1,54 @@
 [build-system]
 requires = [
-    "setuptools >= 42",
+    "setuptools >= 61.0.0",
     "setuptools_scm[toml] >= 6.2",
-    "setuptools_scm_git_archive",
-    "wheel >= 0.29.0",
 ]
 build-backend = "setuptools.build_meta"
 
+[project]
+name = "zoidberg"
+readme = "README.md"
+authors = [{name = "Peter Hill", email = "peter.hill@york.ac.uk"}, {name = "BOUT++ team"}]
+description = "Generate flux-coordinate independent (FCI) grids for BOUT++"
+license = {text = "GNU Lesser General Public License v3 or later (LGPLv3+)"}
+classifiers = [
+    "Programming Language :: Python",
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Science/Research",
+    "License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)",
+    "Natural Language :: English",
+    "Topic :: Scientific/Engineering :: Visualization",
+]
+keywords = [
+    "bout++",
+    "bout",
+    "plasma",
+    "physics",
+]
+requires-python = ">=3.10"
+dependencies = [
+    "boututils ~= 0.1.10",
+    "numpy ~= 1.24",
+    "sympy ~= 1.7",
+    "scipy ~= 1.10",
+    "matplotlib ~= 3.7",
+    "netCDF4 ~= 1.7",
+    "freeqdsk >= 0.4.0",
+]
+dynamic = ["version"]
+
+[project.urls]
+Documentation = "https://bout-dev.readthedocs.io/en/latest"
+Repository = "https://github.com/boutproject/zoidberg"
+Tracker = "https://github.com/boutproject/zoidberg/issues"
+
+[project.optional-dependencies]
+tests = ["pytest >= 3.3.0"]
+
+[project.scripts]
+zoidberg-rotating-ellipse = "zoidberg.examples.rotating_ellipse:main"
+zoidberg-screwpinch = "zoidberg.examples.screwpinch:main"
+
 [tool.setuptools_scm]
 write_to = "zoidberg/_version.py"
 git_describe_command = "git describe --dirty --tags --first-parent"