Merge pull request #2631 from enwask/drop-39

deps: Drop Python 3.9

Author: mloubout

.github/workflows/flake8.yml

@@ -21,10 +21,10 @@ jobs:
 
     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

.github/workflows/pytest-core-mpi.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: ['3.9', '3.11']
+        python-version: ['3.10', '3.11']
 
     env:
       DEVITO_LANGUAGE: "openmp"

.github/workflows/pytest-core-nompi.yml

@@ -32,13 +32,13 @@ jobs:
         name: [
            pytest-ubuntu-py311-gcc11-cxxnoomp,
            pytest-ubuntu-py312-gcc12-cxxomp,
-           pytest-ubuntu-py39-gcc14-omp,
-           pytest-ubuntu-py310-gcc10-noomp,
+           pytest-ubuntu-py310-gcc14-omp,
+           pytest-ubuntu-py311-gcc10-noomp,
            pytest-ubuntu-py312-gcc13-omp,
-           pytest-ubuntu-py39-gcc9-omp,
+           pytest-ubuntu-py310-gcc9-omp,
            pytest-osx-py312-clang-omp,
-           pytest-docker-py39-gcc-omp,
-           pytest-docker-py39-icx-omp
+           pytest-docker-py310-gcc-omp,
+           pytest-docker-py310-icx-omp
         ]
         set: [base, adjoint]
         include:
@@ -56,15 +56,15 @@ jobs:
           language: "CXXopenmp"
           sympy: "1.13"
 
-        - name: pytest-ubuntu-py39-gcc14-omp
-          python-version: '3.9'
+        - name: pytest-ubuntu-py310-gcc14-omp
+          python-version: '3.10'
           os: ubuntu-24.04
           arch: "gcc-14"
           language: "openmp"
           sympy: "1.12"
 
-        - name: pytest-ubuntu-py310-gcc10-noomp
-          python-version: '3.10'
+        - name: pytest-ubuntu-py311-gcc10-noomp
+          python-version: '3.11'
           os: ubuntu-22.04
           arch: "gcc-10"
           language: "C"
@@ -77,8 +77,8 @@ jobs:
           language: "openmp"
           sympy: "1.13"
 
-        - name: pytest-ubuntu-py39-gcc9-omp
-          python-version: '3.9'
+        - name: pytest-ubuntu-py310-gcc9-omp
+          python-version: '3.10'
           os: ubuntu-22.04
           arch: "custom"
           language: "openmp"
@@ -91,15 +91,15 @@ jobs:
           language: "openmp"
           sympy: "1.12"
 
-        - name: pytest-docker-py39-gcc-omp
-          python-version: '3.9'
+        - name: pytest-docker-py310-gcc-omp
+          python-version: '3.10'
           os: ubuntu-latest
           arch: "gcc"
           language: "openmp"
           sympy: "1.13"
 
-        - name: pytest-docker-py39-icx-omp
-          python-version: '3.9'
+        - name: pytest-docker-py310-icx-omp
+          python-version: '3.10'
           os: ubuntu-latest
           arch: "icx"
           language: "openmp"
@@ -166,6 +166,18 @@ jobs:
         python3 -m pip install ${{ env.PIPFLAGS }} -e .[tests,extras]
         python3 -m pip install ${{ env.PIPFLAGS }} sympy==${{matrix.sympy}}
 
+    - name: Check Docker image Python version
+      if: "contains(matrix.name, 'docker')"
+      run: |
+        declared_pyver="${{ matrix.python-version }}"
+        actual_pyver=$(${{ env.RUN_CMD }} python3 --version | grep "Python " | cut -d' ' -f2 | cut -d'.' -f1,2)
+        echo "Declared Python version: $declared_pyver"
+        echo "Actual Python version: $actual_pyver"
+        if [ "$declared_pyver" != "$actual_pyver" ]; then
+          echo "Python version mismatch: declared $declared_pyver, image has $actual_pyver"
+          exit 1
+        fi
+
     - name: Check configuration
       run: |
         ${{ env.RUN_CMD }} python3 -c "from devito import configuration; print(''.join(['%s: %s \n' % (k, v) for (k, v) in configuration.items()]))"

.github/workflows/tutorials.yml

@@ -28,29 +28,29 @@ jobs:
       fail-fast: false
       matrix:
         name: [
-          tutos-ubuntu-gcc-py39,
+          tutos-ubuntu-gcc-py310,
           tutos-osx-clang-py311,
-          tutos-docker-gcc-py39
+          tutos-docker-gcc-py310
           ]
 
         include:
-          - name: tutos-ubuntu-gcc-py39
+          - name: tutos-ubuntu-gcc-py310
             os: ubuntu-latest
             compiler: gcc
             language: "openmp"
-            pyver: "3.9"
+            pyver: "3.10"
 
           - name: tutos-osx-clang-py311
             os: macos-latest
             compiler: clang
             language: "C"
             pyver: "3.11"
 
-          - name: tutos-docker-gcc-py39
+          - name: tutos-docker-gcc-py310
             os: ubuntu-latest
             compiler: gcc
             language: "openmp"
-            pyver: "3.9"
+            pyver: "3.10"
 
     steps:
     - name: Checkout devito
@@ -74,20 +74,32 @@ jobs:
 
     - name: Set run prefix
       run: |
-          if [ "${{ matrix.name }}" == 'tutos-docker-gcc-py39' ]; then
+          if [ "${{ matrix.name }}" == 'tutos-docker-gcc-py310' ]; then
               echo "RUN_CMD=docker run --init -t --rm --name testrun devito_img" >> $GITHUB_ENV
           else
               echo "RUN_CMD=" >> $GITHUB_ENV
           fi
       id: set-run
 
     - name: Install dependencies
-      if: matrix.name != 'tutos-docker-gcc-py39'
+      if: matrix.name != 'tutos-docker-gcc-py310'
       run: |
         python -m pip install --upgrade pip
         pip install -e .[tests,extras]
         pip install blosc
 
+    - name: Check Docker image Python version
+      if: matrix.name == 'tutos-docker-gcc-py310'
+      run: |
+        declared_pyver="${{ matrix.pyver }}"
+        actual_pyver=$(${{ env.RUN_CMD }} python3 --version | cut -d' ' -f2 | cut -d'.' -f1,2)
+        echo "Declared Python version: $declared_pyver"
+        echo "Actual Python version: $actual_pyver"
+        if [ "$declared_pyver" != "$actual_pyver" ]; then
+          echo "Python version mismatch: declared $declared_pyver, image has $actual_pyver"
+          exit 1
+        fi
+
     - name: Seismic notebooks
       run: |
         ${{ env.RUN_CMD }} py.test --nbval -k 'not dask' -k 'not synthetics' examples/seismic/tutorials/

benchmarks/user/advisor/README.md

@@ -57,7 +57,7 @@ advixe-cl --snapshot --project-dir=<advisor-project-name> pack -- /<new-snapshot
 * Running the `tripcounts` analysis is time-consuming, despite starting in paused
   mode. This analysis, together with the `survey` analysis, is necessary to
   generate a roofline. Both are run by `run_advisor.py`.
-* Requires Python 3.9 or later, untested in conda environments
+* Requires Python 3.10 or later, untested in conda environments
 * Currently requires download of repository and running `pip install .`, the scripts
   are currently not included as a package with the user installation of Devito
 

environment-dev.yml

@@ -3,7 +3,7 @@ channels:
   - defaults
   - conda-forge
 dependencies:
-  - python>=3.9,<3.13
+  - python>=3.10,<3.13
   - pip>=21.1.2
   - pip:
     - -r requirements.txt

pyproject.toml

@@ -12,7 +12,7 @@ description = "Finite Difference DSL for symbolic computation."
 license = { file = "LICENSE.md" }
 readme = "README.md"
 keywords = ["finite-difference", "DSL", "symbolic", "jit", "devito"]
-requires-python = ">=3.9"
+requires-python = ">=3.10,<3.13"
 authors = [
   { name = "Imperial College London", email = "g.gorman@imperial.ac.uk" },
   { name = "Fabio Luporini",  email = "fabio@devitocodes.com" },
@@ -29,7 +29,6 @@ classifiers = [
   "Operating System :: Unix",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
@@ -87,4 +86,4 @@ ignore = [
   "W503","F405","E722","E741",
   "W504","W605"
 ]
-exclude = [ ".github" ]
+exclude = [ ".github" ]