Skip to content

Commit afbfb85

Browse files
committed
tests: test installed sympy version
1 parent 3c0887d commit afbfb85

2 files changed

Lines changed: 13 additions & 11 deletions

File tree

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,16 @@ jobs:
166166
python3 -m pip install ${{ env.PIPFLAGS }} sympy==${{matrix.sympy}}
167167
python3 -m pip install ${{ env.PIPFLAGS }} -e .[tests,extras]
168168
169+
- name: Check sympy version
170+
if: "!contains(matrix.name, 'docker')"
171+
run: |
172+
full=$(pip show sympy | awk '/^Version:/ {print $2}')
173+
majmin=${full%.*}
174+
if [[ $majmin != ${{ matrix.sympy }} ]]; then
175+
echo "::error::Sympy version mismatch: expected" ${{ matrix.sympy }} " got " $full
176+
exit 1
177+
fi
178+
169179
- name: Check configuration
170180
run: |
171181
${{ env.RUN_CMD }} python3 -c "from devito import configuration; print(''.join(['%s: %s \n' % (k, v) for (k, v) in configuration.items()]))"

setup.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
from packaging.version import Version
33
import os
44

5-
try:
6-
import importlib.metadata as metadata
7-
get_version = lambda x: metadata.version(x)
8-
PkgNotFound = metadata.PackageNotFoundError
9-
except ImportError:
10-
import pkg_resources
11-
get_version = lambda x: pkg_resources.get_distribution(x).version
12-
PkgNotFound = pkg_resources.DistributionNotFound
13-
145
from setuptools import setup, find_packages
156

167

@@ -32,13 +23,14 @@ def numpy_compat(required):
3223
# Check if sympy is installed and enforce numpy version accordingly.
3324
# If sympy isn't installed, enforce sympy>=1.12.1 and numpy>=2.0
3425
try:
35-
sympy_version = Version(get_version("sympy"))
26+
import sympy
27+
sympy_version = Version(sympy.__version__)
3628
min_ver2 = Version("1.12.1")
3729
if sympy_version < min_ver2:
3830
new_reqs.extend([f"numpy>{numpy_lb},<2.0", f"sympy=={sympy_version}"])
3931
else:
4032
new_reqs.extend([f"numpy>=2.0,<{numpy_ub}", f"sympy=={sympy_version}"])
41-
except PkgNotFound:
33+
except ImportError:
4234
new_reqs.extend([f"sympy>=1.12.1,<{sympy_ub}", f"numpy>=2.0,<{numpy_ub}"])
4335

4436
return new_reqs

0 commit comments

Comments
 (0)