Skip to content

Commit 3c0887d

Browse files
committed
deps: fix sympy compat check
1 parent c91cee0 commit 3c0887d

4 files changed

Lines changed: 22 additions & 8 deletions

File tree

.github/dependabot.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,14 @@ updates:
1616
prefix: "pip prod"
1717
prefix-development: "pip dev"
1818
include: "scope"
19+
- package-ecosystem: "github-actions"
20+
directory: "/" # Location of package manifests
21+
schedule:
22+
interval: "weekly"
23+
# Add assignees
24+
assignees:
25+
- "mloubout"
26+
commit-message:
27+
prefix: "gh"
28+
prefix-development: "gh dev"
29+
include: "scope"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
os: ubuntu-22.04
6969
arch: "gcc-10"
7070
language: "C"
71-
sympy: "1.11"
71+
sympy: "1.12"
7272

7373
- name: pytest-ubuntu-py312-gcc13-omp
7474
python-version: '3.12'

devito/types/tensor.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
from functools import cached_property
33

44
import numpy as np
5-
from sympy.matrices.matrixbase import MatrixBase
5+
try:
6+
from sympy.matrices.matrixbase import MatrixBase
7+
except ImportError:
8+
# Before 1.13
9+
from sympy.matrices.matrices import MatrixBase
610
from sympy.core.sympify import converter as sympify_converter
711

812
from devito.finite_differences import Differentiable

setup.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
import versioneer
2-
2+
from packaging.version import Version
33
import os
4+
45
try:
56
import importlib.metadata as metadata
67
get_version = lambda x: metadata.version(x)
78
PkgNotFound = metadata.PackageNotFoundError
8-
parse_version = lambda x: metadata.version(x)
99
except ImportError:
1010
import pkg_resources
1111
get_version = lambda x: pkg_resources.get_distribution(x).version
1212
PkgNotFound = pkg_resources.DistributionNotFound
13-
parse_version = lambda x: pkg_resources.parse_version(x)
1413

1514
from setuptools import setup, find_packages
1615

@@ -33,9 +32,9 @@ def numpy_compat(required):
3332
# Check if sympy is installed and enforce numpy version accordingly.
3433
# If sympy isn't installed, enforce sympy>=1.12.1 and numpy>=2.0
3534
try:
36-
sympy_version = get_version("sympy")
37-
min_ver2 = parse_version("1.12.1")
38-
if parse_version(sympy_version) < min_ver2:
35+
sympy_version = Version(get_version("sympy"))
36+
min_ver2 = Version("1.12.1")
37+
if sympy_version < min_ver2:
3938
new_reqs.extend([f"numpy>{numpy_lb},<2.0", f"sympy=={sympy_version}"])
4039
else:
4140
new_reqs.extend([f"numpy>=2.0,<{numpy_ub}", f"sympy=={sympy_version}"])

0 commit comments

Comments
 (0)