Skip to content

Commit

Permalink
deps: bump minimal python version to 3.9
Browse files Browse the repository at this point in the history
  • Loading branch information
mloubout committed Jul 24, 2024
1 parent e0cbe0e commit 9ca3bac
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 31 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@ jobs:
uses: actions/checkout@v4

- name: Setup conda
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
python-version: 3.8
activate-environment: devito
environment-file: environment-dev.yml
auto-activate-base: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest-core-mpi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ['3.8','3.9']
python-version: ['3.9', '3.11']

env:
DEVITO_LANGUAGE: "openmp"
Expand Down
31 changes: 11 additions & 20 deletions .github/workflows/pytest-core-nompi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
env:
DEVITO_ARCH: "${{ matrix.arch }}"
DEVITO_LANGUAGE: ${{ matrix.language }}
DEVITO_PLATFORM: ${{ matrix.platform }}
OMP_NUM_THREADS: 2

strategy:
Expand All @@ -32,8 +31,8 @@ jobs:
matrix:
name: [
pytest-ubuntu-py311-gcc11-noomp,
pytest-ubuntu-py38-gcc12-omp,
pytest-ubuntu-py38-gcc7-omp,
pytest-ubuntu-py312-gcc12-omp,
pytest-ubuntu-py39-gcc7-omp,
pytest-ubuntu-py310-gcc10-noomp,
pytest-ubuntu-py312-gcc13-omp,
pytest-ubuntu-py39-gcc9-omp,
Expand All @@ -49,71 +48,62 @@ jobs:
arch: "gcc-11"
language: "C"
sympy: "1.11"
platform: "cpu64"

- name: pytest-ubuntu-py38-gcc12-omp
python-version: '3.8'
os: ubuntu-22.04
- name: pytest-ubuntu-py312-gcc12-omp
python-version: '3.12'
os: ubuntu-24.04
arch: "gcc-12"
language: "openmp"
sympy: "1.10"
platform: "cpu64"
sympy: "1.13"

- name: pytest-ubuntu-py38-gcc7-omp
python-version: '3.8'
- name: pytest-ubuntu-py39-gcc7-omp
python-version: '3.9'
os: ubuntu-20.04
arch: "gcc-7"
language: "openmp"
sympy: "1.9"
platform: "cpu64"

- name: pytest-ubuntu-py310-gcc10-noomp
python-version: '3.10'
os: ubuntu-20.04
arch: "gcc-10"
language: "C"
sympy: "1.11"
platform: "cpu64"

- name: pytest-ubuntu-py312-gcc13-omp
python-version: '3.12'
os: ubuntu-24.04
arch: "gcc-13"
language: "openmp"
sympy: "1.13"
platform: "cpu64"

- name: pytest-ubuntu-py39-gcc9-omp
python-version: '3.9'
os: ubuntu-20.04
arch: "custom"
language: "openmp"
sympy: "1.9"
platform: "cpu64"
sympy: "1.10"

- name: pytest-osx-py312-clang-omp
python-version: '3.12'
os: macos-latest
arch: "clang"
language: "openmp"
sympy: "1.9"
platform: "m1"
sympy: "1.13"

- name: pytest-docker-py39-gcc-omp
python-version: '3.9'
os: ubuntu-latest
arch: "gcc"
language: "openmp"
sympy: "1.12"
platform: "cpu64"

- name: pytest-docker-py39-icx-omp
python-version: '3.9'
os: ubuntu-latest
arch: "icx"
language: "openmp"
sympy: "1.12"
platform: "intel64"

- set: base
test-set: 'not adjoint'
Expand All @@ -134,6 +124,7 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
allow-prereleases: true

- name: Build docker image
if: contains(matrix.name, 'docker')
Expand Down
1 change: 0 additions & 1 deletion requirements-optional.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
matplotlib
pandas
pyrevolve==2.2.4
scipy
distributed
8 changes: 1 addition & 7 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import versioneer

import os
import sys
import pkg_resources
from setuptools import setup, find_packages

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

# Due to api changes in numpy 2.0, it requires sympy 1.12.1 at the minimum
# Check if sympy is installed and enforce numpy version accordingly.
Expand Down Expand Up @@ -108,7 +103,7 @@ def numpy_compat(required):
},
url='http://www.devitoproject.org',
platforms=["Linux", "Mac OS-X", "Unix"],
python_requires=">=3.8",
python_requires=">=3.9",
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
Expand All @@ -120,7 +115,6 @@ def numpy_compat(required):
'Operating System :: Unix',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
Expand Down

0 comments on commit 9ca3bac

Please sign in to comment.