attempt to get RTD and GitHub Actions working again

Guymer · Sep 27, 2024 · d943d9f · d943d9f
1 parent b3829ff
commit d943d9f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/gmake.yml b/.github/workflows/gmake.yml
@@ -7,10 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                python-version: ["3.10", "3.11"]                                # As of 27/July/2024, Python 3.12 is not attempted because the version of Meson
-                                                                                # available is too old for "f2py" to succeed, see the following error last time
-                                                                                # I tried:
-                                                                                #   * meson.build:1:0: ERROR: Meson version is 0.61.2 but project requires >= 1.1.0
+                python-version: ["3.10", "3.11", "3.12"]
         steps:
             -
                 name: Checkout project                                          # https://github.com/actions/checkout
@@ -42,6 +39,10 @@ jobs:
                     echo "::notice $(which pip)"
                     echo "::notice $(which python)"
             -
+                # As of 27/Sept/2024, the version of Meson available is too old
+                # for "f2py" to succeed, see the following error last time I
+                # tried:
+                #   * meson.build:1:0: ERROR: Meson version is 0.61.2 but project requires >= 1.1.0
                 name: Compile the FORTRAN code
                 run: |
                     cd main

diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
@@ -7,10 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                python-version: ["3.10", "3.11"]                                # As of 27/July/2024, Python 3.12 is not attempted because the version of Meson
-                                                                                # available is too old for "f2py" to succeed, see the following error last time
-                                                                                # I tried:
-                                                                                #   * meson.build:1:0: ERROR: Meson version is 0.61.2 but project requires >= 1.1.0
+                python-version: ["3.10", "3.11", "3.12"]
         steps:
             -
                 name: Checkout project                                          # https://github.com/actions/checkout
@@ -38,6 +35,10 @@ jobs:
                     echo "::notice $(which pylint)"
                     echo "::notice $(which python)"
             -
+                # As of 27/Sept/2024, the version of Meson available is too old
+                # for "f2py" to succeed, see the following error last time I
+                # tried:
+                #   * meson.build:1:0: ERROR: Meson version is 0.61.2 but project requires >= 1.1.0
                 name: Analyse the Python ${{ matrix.python-version }} code
                 run: |
                     cd main

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -15,15 +15,19 @@ build:
         - gfortran-12
     jobs:
         post_install:
+            # As of 27/Sept/2024, the version of Meson available is too old for
+            # "f2py" to succeed, see the following error last time I tried:
+            #   * meson.build:1:0: ERROR: Meson version is 0.61.2 but project requires >= 1.1.0
             - which f2py
             - which gfortran-12
             - which gmake
+            - which meson
             - which pip3
             - which python3
             - pip3 install git+https://github.com/VACUMM/sphinx-fortran.git@master
     os: ubuntu-22.04
     tools:
-        python: "3.11"
+        python: "3.12"
 
 python:
     install:

diff --git a/requirements.txt b/requirements.txt
@@ -2,6 +2,7 @@
 # "check_READMEs.py" script from "https://github.com/Guymer/misc".
 
 matplotlib
+meson
 scipy
 sphinx
 sphinx_rtd_theme