Skip to content

Commit 6509d71

Browse files
authored
Merge pull request #2605 from devitocodes/sympy-compate
deps: Update minimal for sympy and numpy
2 parents c91cee0 + 8b43ba4 commit 6509d71

12 files changed

Lines changed: 142 additions & 3143 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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
os: ubuntu-22.04
4848
arch: "gcc-11"
4949
language: "CXX"
50-
sympy: "1.11"
50+
sympy: "1.14"
5151

5252
- name: pytest-ubuntu-py312-gcc12-cxxomp
5353
python-version: '3.12'
@@ -61,14 +61,14 @@ jobs:
6161
os: ubuntu-24.04
6262
arch: "gcc-14"
6363
language: "openmp"
64-
sympy: "1.9"
64+
sympy: "1.12"
6565

6666
- name: pytest-ubuntu-py310-gcc10-noomp
6767
python-version: '3.10'
6868
os: ubuntu-22.04
6969
arch: "gcc-10"
7070
language: "C"
71-
sympy: "1.11"
71+
sympy: "1.14"
7272

7373
- name: pytest-ubuntu-py312-gcc13-omp
7474
python-version: '3.12'
@@ -82,28 +82,28 @@ jobs:
8282
os: ubuntu-22.04
8383
arch: "custom"
8484
language: "openmp"
85-
sympy: "1.10"
85+
sympy: "1.12"
8686

8787
- name: pytest-osx-py312-clang-omp
8888
python-version: '3.12'
8989
os: macos-latest
9090
arch: "clang"
9191
language: "openmp"
92-
sympy: "1.13"
92+
sympy: "1.12"
9393

9494
- name: pytest-docker-py39-gcc-omp
9595
python-version: '3.9'
9696
os: ubuntu-latest
9797
arch: "gcc"
9898
language: "openmp"
99-
sympy: "1.12"
99+
sympy: "1.13"
100100

101101
- name: pytest-docker-py39-icx-omp
102102
python-version: '3.9'
103103
os: ubuntu-latest
104104
arch: "icx"
105105
language: "openmp"
106-
sympy: "1.12"
106+
sympy: "1.13"
107107

108108
- set: base
109109
test-set: 'not adjoint'
@@ -163,8 +163,8 @@ jobs:
163163
if: "!contains(matrix.name, 'docker')"
164164
run: |
165165
python3 -m pip install ${{ env.PIPFLAGS }} --upgrade pip
166-
python3 -m pip install ${{ env.PIPFLAGS }} sympy==${{matrix.sympy}}
167166
python3 -m pip install ${{ env.PIPFLAGS }} -e .[tests,extras]
167+
python3 -m pip install ${{ env.PIPFLAGS }} sympy==${{matrix.sympy}}
168168
169169
- name: Check configuration
170170
run: |

.github/workflows/pythonpublish.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,16 @@ jobs:
1515
python-version: '3.x'
1616
- name: Install dependencies
1717
run: |
18-
python -m pip install --upgrade pip
19-
pip install setuptools wheel twine==5.0.0
18+
python -m pip install --upgrade pip build twine
2019
21-
- name: Build and publish
20+
- name: Build distribution artifacts
21+
run: |
22+
# this will read pyproject.toml and produce both sdist and wheel in dist/
23+
python -m build --sdist --wheel
24+
25+
- name: Publish to PyPI
2226
env:
2327
TWINE_USERNAME: __token__
2428
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
2529
run: |
26-
python setup.py sdist bdist_wheel
2730
twine upload dist/*

devito/__init__.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@
4747
from devito.mpatches import * # noqa
4848

4949

50-
from ._version import get_versions # noqa
51-
__version__ = get_versions()['version']
52-
del get_versions
50+
from ._version import version as __version__ # noqa
5351

5452

5553
def reinit_compiler(val):

0 commit comments

Comments
 (0)