Skip to content

Commit f2a7df1

Browse files
ZoeLeibowitzZoeLeibowitz
committed
misc: Fix merge conflicts with main
2 parents 7e21e5b + 8fa28c3 commit f2a7df1

103 files changed

Lines changed: 1705 additions & 3661 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.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/asv.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
rm -f /tmp/ssh-auth.sock
8989
9090
- name: Deploy results to devitocodes/devito-performance/gh-pages
91-
uses: peaceiris/actions-gh-pages@v3
91+
uses: peaceiris/actions-gh-pages@v4
9292
with:
9393
deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
9494
external_repository: devitocodes/devito-performance

‎.github/workflows/docker-bases.yml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ jobs:
5555
run: echo ${{ github.event_name }}
5656

5757
- name: Set up QEMU
58-
uses: docker/setup-qemu-action@v2
58+
uses: docker/setup-qemu-action@v3
5959

6060
- name: Set up Docker Buildx
61-
uses: docker/setup-buildx-action@v2
61+
uses: docker/setup-buildx-action@v3
6262

6363
- name: Login to DockerHub
64-
uses: docker/login-action@v2
64+
uses: docker/login-action@v3
6565
with:
6666
username: ${{ secrets.DOCKER_USERNAME }}
6767
password: ${{ secrets.DOCKER_PASSWORD }}
@@ -70,7 +70,7 @@ jobs:
7070
run: docker system prune -a -f
7171

7272
- name: GCC image
73-
uses: docker/build-push-action@v5
73+
uses: docker/build-push-action@v6
7474
with:
7575
context: .
7676
file: './docker/Dockerfile.cpu'
@@ -97,13 +97,13 @@ jobs:
9797
run: echo ${{ github.event_name }}
9898

9999
- name: Set up QEMU
100-
uses: docker/setup-qemu-action@v2
100+
uses: docker/setup-qemu-action@v3
101101

102102
- name: Set up Docker Buildx
103-
uses: docker/setup-buildx-action@v2
103+
uses: docker/setup-buildx-action@v3
104104

105105
- name: Login to DockerHub
106-
uses: docker/login-action@v2
106+
uses: docker/login-action@v3
107107
with:
108108
username: ${{ secrets.DOCKER_USERNAME }}
109109
password: ${{ secrets.DOCKER_PASSWORD }}
@@ -112,7 +112,7 @@ jobs:
112112
run: docker system prune -a -f
113113

114114
- name: ICX image
115-
uses: docker/build-push-action@v5
115+
uses: docker/build-push-action@v6
116116
with:
117117
context: .
118118
file: './docker/Dockerfile.intel'
@@ -122,7 +122,7 @@ jobs:
122122
tags: 'devitocodes/bases:cpu-icx'
123123

124124
- name: SYCL CPU image
125-
uses: docker/build-push-action@v5
125+
uses: docker/build-push-action@v6
126126
with:
127127
context: .
128128
file: './docker/Dockerfile.intel'
@@ -132,7 +132,7 @@ jobs:
132132
tags: 'devitocodes/bases:cpu-sycl'
133133

134134
- name: SYCL GPU image
135-
uses: docker/build-push-action@v5
135+
uses: docker/build-push-action@v6
136136
with:
137137
context: .
138138
file: './docker/Dockerfile.intel'
@@ -159,13 +159,13 @@ jobs:
159159
run: echo ${{ github.event_name }}
160160

161161
- name: Set up QEMU
162-
uses: docker/setup-qemu-action@v2
162+
uses: docker/setup-qemu-action@v3
163163

164164
- name: Set up Docker Buildx
165-
uses: docker/setup-buildx-action@v2
165+
uses: docker/setup-buildx-action@v3
166166

167167
- name: Login to DockerHub
168-
uses: docker/login-action@v2
168+
uses: docker/login-action@v3
169169
with:
170170
username: ${{ secrets.DOCKER_USERNAME }}
171171
password: ${{ secrets.DOCKER_PASSWORD }}
@@ -174,7 +174,7 @@ jobs:
174174
run: docker system prune -a -f
175175

176176
- name: NVC image
177-
uses: docker/build-push-action@v5
177+
uses: docker/build-push-action@v6
178178
with:
179179
context: .
180180
file: './docker/Dockerfile.nvidia'
@@ -184,7 +184,7 @@ jobs:
184184
tags: 'devitocodes/bases:nvidia-nvc'
185185

186186
- name: NVCC image
187-
uses: docker/build-push-action@v5
187+
uses: docker/build-push-action@v6
188188
with:
189189
context: .
190190
file: './docker/Dockerfile.nvidia'
@@ -194,7 +194,7 @@ jobs:
194194
tags: 'devitocodes/bases:nvidia-nvcc'
195195

196196
- name: NVC host image
197-
uses: docker/build-push-action@v5
197+
uses: docker/build-push-action@v6
198198
with:
199199
context: .
200200
file: './docker/Dockerfile.nvidia'
@@ -221,13 +221,13 @@ jobs:
221221
run: echo ${{ github.event_name }}
222222

223223
- name: Set up QEMU
224-
uses: docker/setup-qemu-action@v2
224+
uses: docker/setup-qemu-action@v3
225225

226226
- name: Set up Docker Buildx
227-
uses: docker/setup-buildx-action@v2
227+
uses: docker/setup-buildx-action@v3
228228

229229
- name: Login to DockerHub
230-
uses: docker/login-action@v2
230+
uses: docker/login-action@v3
231231
with:
232232
username: ${{ secrets.DOCKER_USERNAME }}
233233
password: ${{ secrets.DOCKER_PASSWORD }}
@@ -236,7 +236,7 @@ jobs:
236236
run: docker system prune -a -f
237237

238238
- name: AMD image
239-
uses: docker/build-push-action@v5
239+
uses: docker/build-push-action@v6
240240
with:
241241
context: .
242242
file: './docker/Dockerfile.amd'
@@ -249,7 +249,7 @@ jobs:
249249
tags: devitocodes/bases:amd
250250

251251
- name: AMD HIP image
252-
uses: docker/build-push-action@v5
252+
uses: docker/build-push-action@v6
253253
with:
254254
context: .
255255
file: './docker/Dockerfile.amd'

‎.github/workflows/docker-devito.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,20 @@ jobs:
5151
run: echo ${{ github.event_name }}
5252

5353
- name: Set up QEMU
54-
uses: docker/setup-qemu-action@v2
54+
uses: docker/setup-qemu-action@v3
5555

5656
- name: Set up Docker Buildx
57-
uses: docker/setup-buildx-action@v2
57+
uses: docker/setup-buildx-action@v3
5858

5959
- name: Login to DockerHub
60-
uses: docker/login-action@v2
60+
uses: docker/login-action@v3
6161
with:
6262
username: ${{ secrets.DOCKER_USERNAME }}
6363
password: ${{ secrets.DOCKER_PASSWORD }}
6464

6565
- name: Docker meta
6666
id: meta
67-
uses: docker/metadata-action@v4
67+
uses: docker/metadata-action@v5
6868
with:
6969
flavor: |
7070
latest=false
@@ -93,7 +93,7 @@ jobs:
9393
run: echo "${{ steps.meta.outputs.tags }}"
9494

9595
- name: Build and push image
96-
uses: docker/build-push-action@v3
96+
uses: docker/build-push-action@v6
9797
with:
9898
context: .
9999
file: ./docker/Dockerfile.devito

‎.github/workflows/examples.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
python examples/cfd/example_diffusion.py
8585
8686
- name: Upload coverage to Codecov
87-
uses: codecov/codecov-action@v4
87+
uses: codecov/codecov-action@v5
8888
with:
8989
token: ${{ secrets.CODECOV_TOKEN }}
9090
name: ${{ matrix.name }}

‎.github/workflows/flake8.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ jobs:
3030
- name: Install dependencies
3131
run: |
3232
python -m pip install --upgrade pip
33-
pip install flake8
33+
pip install flake8-pyproject
34+
3435
- name: Lint with flake8
3536
run: |
3637
flake8 --builtins=ArgumentError .

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
DEVITO_MPI=1 mpirun -n 2 python3 -m pytest examples/seismic/tti
5959
6060
- name: Upload coverage to Codecov
61-
uses: codecov/codecov-action@v4
61+
uses: codecov/codecov-action@v5
6262
with:
6363
token: ${{ secrets.CODECOV_TOKEN }}
6464
name: pytest-mpi

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232

3333
matrix:
3434
name: [
35-
pytest-ubuntu-py311-gcc11-noomp,
36-
pytest-ubuntu-py312-gcc12-omp,
35+
pytest-ubuntu-py311-gcc11-cxxnoomp,
36+
pytest-ubuntu-py312-gcc12-cxxomp,
3737
pytest-ubuntu-py39-gcc14-omp,
3838
pytest-ubuntu-py310-gcc10-noomp,
3939
pytest-ubuntu-py312-gcc13-omp,
@@ -44,33 +44,33 @@ jobs:
4444
]
4545
set: [base, adjoint]
4646
include:
47-
- name: pytest-ubuntu-py311-gcc11-noomp
47+
- name: pytest-ubuntu-py311-gcc11-cxxnoomp
4848
python-version: '3.11'
4949
os: ubuntu-22.04
5050
arch: "gcc-11"
51-
language: "C"
52-
sympy: "1.11"
51+
language: "CXX"
52+
sympy: "1.14"
5353

54-
- name: pytest-ubuntu-py312-gcc12-omp
54+
- name: pytest-ubuntu-py312-gcc12-cxxomp
5555
python-version: '3.12'
5656
os: ubuntu-24.04
5757
arch: "gcc-12"
58-
language: "openmp"
58+
language: "CXXopenmp"
5959
sympy: "1.13"
6060

6161
- name: pytest-ubuntu-py39-gcc14-omp
6262
python-version: '3.9'
6363
os: ubuntu-24.04
6464
arch: "gcc-14"
6565
language: "openmp"
66-
sympy: "1.9"
66+
sympy: "1.12"
6767

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

7575
- name: pytest-ubuntu-py312-gcc13-omp
7676
python-version: '3.12'
@@ -84,28 +84,28 @@ jobs:
8484
os: ubuntu-22.04
8585
arch: "custom"
8686
language: "openmp"
87-
sympy: "1.10"
87+
sympy: "1.12"
8888

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

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

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

110110
- set: base
111111
test-set: 'not adjoint'
@@ -165,8 +165,8 @@ jobs:
165165
if: "!contains(matrix.name, 'docker')"
166166
run: |
167167
python3 -m pip install ${{ env.PIPFLAGS }} --upgrade pip
168-
python3 -m pip install ${{ env.PIPFLAGS }} sympy==${{matrix.sympy}}
169168
python3 -m pip install ${{ env.PIPFLAGS }} -e .[tests,extras]
169+
python3 -m pip install ${{ env.PIPFLAGS }} sympy==${{matrix.sympy}}
170170
171171
- name: Check configuration
172172
run: |
@@ -178,7 +178,7 @@ jobs:
178178
179179
- name: Upload coverage to Codecov
180180
if: "!contains(matrix.name, 'docker')"
181-
uses: codecov/codecov-action@v4
181+
uses: codecov/codecov-action@v5
182182
with:
183183
token: ${{ secrets.CODECOV_TOKEN }}
184184
name: ${{ matrix.name }}

‎.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/*

‎.github/workflows/release-notes.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
# Drafts your next Release notes as Pull Requests are merged into "main"
14-
- uses: release-drafter/release-drafter@v5
14+
- uses: release-drafter/release-drafter@v6
1515
env:
1616
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)