tests: test installed sympy version

Author: mloubout

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

@@ -47,7 +47,7 @@ jobs:
           os: ubuntu-22.04
           arch: "gcc-11"
           language: "CXX"
-          sympy: "1.11"
+          sympy: "1.12"
 
         - name: pytest-ubuntu-py312-gcc12-cxxomp
           python-version: '3.12'
@@ -61,7 +61,7 @@ jobs:
           os: ubuntu-24.04
           arch: "gcc-14"
           language: "openmp"
-          sympy: "1.9"
+          sympy: "1.14"
 
         - name: pytest-ubuntu-py310-gcc10-noomp
           python-version: '3.10'
@@ -82,28 +82,28 @@ jobs:
           os: ubuntu-22.04
           arch: "custom"
           language: "openmp"
-          sympy: "1.10"
+          sympy: "1.14"
 
         - name: pytest-osx-py312-clang-omp
           python-version: '3.12'
           os: macos-latest
           arch: "clang"
           language: "openmp"
-          sympy: "1.13"
+          sympy: "1.12"
 
         - name: pytest-docker-py39-gcc-omp
           python-version: '3.9'
           os: ubuntu-latest
           arch: "gcc"
           language: "openmp"
-          sympy: "1.12"
+          sympy: "1.13"
 
         - name: pytest-docker-py39-icx-omp
           python-version: '3.9'
           os: ubuntu-latest
           arch: "icx"
           language: "openmp"
-          sympy: "1.12"
+          sympy: "1.14"
 
         - set: base
           test-set: 'not adjoint'
@@ -166,6 +166,16 @@ jobs:
         python3 -m pip install ${{ env.PIPFLAGS }} sympy==${{matrix.sympy}}
         python3 -m pip install ${{ env.PIPFLAGS }} -e .[tests,extras]
 
+    - name: Check sympy version
+      if: "!contains(matrix.name, 'docker')"
+      run: |
+        full=$(pip show sympy | awk '/^Version:/ {print $2}')
+        majmin=${full%.*}
+        if [[ $majmin != ${{ matrix.sympy }} ]]; then
+          echo "::error::Sympy version mismatch: expected" ${{ matrix.sympy }} " got " $full
+          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()]))"

requirements.txt

@@ -1,6 +1,6 @@
 pip>=9.0.1
-numpy>1.16,<2.3
-sympy>=1.9,<1.14
+numpy>=2,<2.3
+sympy>=1.12.1,<1.15
 psutil>=5.1.0,<8.0
 py-cpuinfo<10
 cgen>=2020.1,<2021

setup.py

@@ -1,18 +1,6 @@
-import versioneer
-from packaging.version import Version
 import os
-
-try:
-    import importlib.metadata as metadata
-    get_version = lambda x: metadata.version(x)
-    PkgNotFound = metadata.PackageNotFoundError
-except ImportError:
-    import pkg_resources
-    get_version = lambda x: pkg_resources.get_distribution(x).version
-    PkgNotFound = pkg_resources.DistributionNotFound
-
 from setuptools import setup, find_packages
-
+import versioneer
 
 def min_max(pkgs, pkg_name):
     pkg = [p for p in pkgs if pkg_name in p][0]
@@ -22,31 +10,8 @@ def min_max(pkgs, pkg_name):
     vmax = pkg.split(maxsign)[-1]
     return vmin, vmax
 
-
-def numpy_compat(required):
-    new_reqs = [r for r in required if "numpy" not in r and "sympy" not in r]
-    sympy_lb, sympy_ub = min_max(required, "sympy")
-    numpy_lb, numpy_ub = min_max(required, "numpy")
-
-    # Due to api changes in numpy 2.0, it requires sympy 1.12.1 at the minimum
-    # Check if sympy is installed and enforce numpy version accordingly.
-    # If sympy isn't installed, enforce sympy>=1.12.1 and numpy>=2.0
-    try:
-        sympy_version = Version(get_version("sympy"))
-        min_ver2 = Version("1.12.1")
-        if sympy_version < min_ver2:
-            new_reqs.extend([f"numpy>{numpy_lb},<2.0", f"sympy=={sympy_version}"])
-        else:
-            new_reqs.extend([f"numpy>=2.0,<{numpy_ub}", f"sympy=={sympy_version}"])
-    except PkgNotFound:
-        new_reqs.extend([f"sympy>=1.12.1,<{sympy_ub}", f"numpy>=2.0,<{numpy_ub}"])
-
-    return new_reqs
-
-
 with open('requirements.txt') as f:
     required = f.read().splitlines()
-    required = numpy_compat(required)
 
 with open('requirements-optional.txt') as f:
     optionals = f.read().splitlines()