Skip to content

Commit 9ca3bac

Browse files
committed
deps: bump minimal python version to 3.9
1 parent e0cbe0e commit 9ca3bac

File tree

5 files changed

+14
-31
lines changed

5 files changed

+14
-31
lines changed

.github/workflows/examples.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ jobs:
3737
uses: actions/checkout@v4
3838

3939
- name: Setup conda
40-
uses: conda-incubator/setup-miniconda@v2
40+
uses: conda-incubator/setup-miniconda@v3
4141
with:
42-
python-version: 3.8
4342
activate-environment: devito
4443
environment-file: environment-dev.yml
4544
auto-activate-base: false

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-20.04
2121
strategy:
2222
matrix:
23-
python-version: ['3.8','3.9']
23+
python-version: ['3.9', '3.11']
2424

2525
env:
2626
DEVITO_LANGUAGE: "openmp"

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

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jobs:
2222
env:
2323
DEVITO_ARCH: "${{ matrix.arch }}"
2424
DEVITO_LANGUAGE: ${{ matrix.language }}
25-
DEVITO_PLATFORM: ${{ matrix.platform }}
2625
OMP_NUM_THREADS: 2
2726

2827
strategy:
@@ -32,8 +31,8 @@ jobs:
3231
matrix:
3332
name: [
3433
pytest-ubuntu-py311-gcc11-noomp,
35-
pytest-ubuntu-py38-gcc12-omp,
36-
pytest-ubuntu-py38-gcc7-omp,
34+
pytest-ubuntu-py312-gcc12-omp,
35+
pytest-ubuntu-py39-gcc7-omp,
3736
pytest-ubuntu-py310-gcc10-noomp,
3837
pytest-ubuntu-py312-gcc13-omp,
3938
pytest-ubuntu-py39-gcc9-omp,
@@ -49,71 +48,62 @@ jobs:
4948
arch: "gcc-11"
5049
language: "C"
5150
sympy: "1.11"
52-
platform: "cpu64"
5351

54-
- name: pytest-ubuntu-py38-gcc12-omp
55-
python-version: '3.8'
56-
os: ubuntu-22.04
52+
- name: pytest-ubuntu-py312-gcc12-omp
53+
python-version: '3.12'
54+
os: ubuntu-24.04
5755
arch: "gcc-12"
5856
language: "openmp"
59-
sympy: "1.10"
60-
platform: "cpu64"
57+
sympy: "1.13"
6158

62-
- name: pytest-ubuntu-py38-gcc7-omp
63-
python-version: '3.8'
59+
- name: pytest-ubuntu-py39-gcc7-omp
60+
python-version: '3.9'
6461
os: ubuntu-20.04
6562
arch: "gcc-7"
6663
language: "openmp"
6764
sympy: "1.9"
68-
platform: "cpu64"
6965

7066
- name: pytest-ubuntu-py310-gcc10-noomp
7167
python-version: '3.10'
7268
os: ubuntu-20.04
7369
arch: "gcc-10"
7470
language: "C"
7571
sympy: "1.11"
76-
platform: "cpu64"
7772

7873
- name: pytest-ubuntu-py312-gcc13-omp
7974
python-version: '3.12'
8075
os: ubuntu-24.04
8176
arch: "gcc-13"
8277
language: "openmp"
8378
sympy: "1.13"
84-
platform: "cpu64"
8579

8680
- name: pytest-ubuntu-py39-gcc9-omp
8781
python-version: '3.9'
8882
os: ubuntu-20.04
8983
arch: "custom"
9084
language: "openmp"
91-
sympy: "1.9"
92-
platform: "cpu64"
85+
sympy: "1.10"
9386

9487
- name: pytest-osx-py312-clang-omp
9588
python-version: '3.12'
9689
os: macos-latest
9790
arch: "clang"
9891
language: "openmp"
99-
sympy: "1.9"
100-
platform: "m1"
92+
sympy: "1.13"
10193

10294
- name: pytest-docker-py39-gcc-omp
10395
python-version: '3.9'
10496
os: ubuntu-latest
10597
arch: "gcc"
10698
language: "openmp"
10799
sympy: "1.12"
108-
platform: "cpu64"
109100

110101
- name: pytest-docker-py39-icx-omp
111102
python-version: '3.9'
112103
os: ubuntu-latest
113104
arch: "icx"
114105
language: "openmp"
115106
sympy: "1.12"
116-
platform: "intel64"
117107

118108
- set: base
119109
test-set: 'not adjoint'
@@ -134,6 +124,7 @@ jobs:
134124
uses: actions/setup-python@v5
135125
with:
136126
python-version: ${{ matrix.python-version }}
127+
allow-prereleases: true
137128

138129
- name: Build docker image
139130
if: contains(matrix.name, 'docker')

requirements-optional.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
matplotlib
2-
pandas
32
pyrevolve==2.2.4
43
scipy
54
distributed

setup.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import versioneer
22

33
import os
4-
import sys
54
import pkg_resources
65
from setuptools import setup, find_packages
76

@@ -19,10 +18,6 @@ def numpy_compat(required):
1918
new_reqs = [r for r in required if "numpy" not in r and "sympy" not in r]
2019
sympy_lb, sympy_ub = min_max(required, "sympy")
2120
numpy_lb, numpy_ub = min_max(required, "numpy")
22-
if sys.version_info < (3, 9):
23-
# Numpy 2.0 requires python > 3.8
24-
new_reqs.extend([f"sympy>={sympy_lb},<1.12.1", f"numpy>{numpy_lb},<2.0"])
25-
return new_reqs
2621

2722
# Due to api changes in numpy 2.0, it requires sympy 1.12.1 at the minimum
2823
# Check if sympy is installed and enforce numpy version accordingly.
@@ -108,7 +103,7 @@ def numpy_compat(required):
108103
},
109104
url='http://www.devitoproject.org',
110105
platforms=["Linux", "Mac OS-X", "Unix"],
111-
python_requires=">=3.8",
106+
python_requires=">=3.9",
112107
classifiers=[
113108
'Development Status :: 5 - Production/Stable',
114109
'Intended Audience :: Developers',
@@ -120,7 +115,6 @@ def numpy_compat(required):
120115
'Operating System :: Unix',
121116
'Programming Language :: Python',
122117
'Programming Language :: Python :: 3',
123-
'Programming Language :: Python :: 3.8',
124118
'Programming Language :: Python :: 3.9',
125119
'Programming Language :: Python :: 3.10',
126120
'Programming Language :: Python :: 3.11',

0 commit comments

Comments
 (0)