Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump python version to 3.12 and macos to macos 13 #129

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions .github/workflows/tests+pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,20 +88,21 @@ jobs:
tests_setup:
strategy:
matrix:
platform: [ubuntu-latest, macos-12]
platform: [ubuntu-latest, macos-13]
mpi: [ 'mpich', 'openmpi', 'intelmpi']
python-version: ["3.10"]
python-version: ["3.10", "3.12"]
exclude:
# as of time of writing, mpi4py/setup-mpi does not support it
- platform: macos-12
- platform: macos-13
mpi: intelmpi

- platform: macos-13
python-version: "3.12"
# issues with: *** The MPI_Comm_rank() function was called before MPI_INIT was invoked.
- platform: ubuntu-latest
mpi: intelmpi

# https://github.com/Homebrew/homebrew-core/issues/26974
- platform: macos-12
- platform: macos-13
mpi: mpich

runs-on: ${{ matrix.platform }}
Expand Down Expand Up @@ -140,7 +141,7 @@ jobs:
sysctl -a | grep cpu | grep hw
- if: steps.cache.outputs.cache-hit != 'true'
run: |
HDF5_MPI="ON" CC=mpicc pip install --no-binary=h5py h5py==3.10.0
HDF5_MPI="ON" CC=mpicc pip install --no-binary=h5py h5py==3.12.1
pip install -e .[tests]
- run: pip show numpy
- id: cache-save
Expand All @@ -154,22 +155,24 @@ jobs:
needs: [zenodo_json, pylint, pdoc, precommit, tests_setup]
strategy:
matrix:
platform: [ubuntu-latest, macos-12]
platform: [ubuntu-latest, macos-13]
mpi: [ 'mpich', 'openmpi', 'intelmpi']
python-version: ["3.10"]
python-version: ["3.10", "3.12"]
disable-jit: [1, 0]
mpi-np: [1, 2, 3]
exclude:
# as of time of writing, mpi4py/setup-mpi does not support it
- platform: macos-12
- platform: macos-13
mpi: intelmpi
- platform: macos-13
python-version: "3.12"

# issues with: *** The MPI_Comm_rank() function was called before MPI_INIT was invoked.
- platform: ubuntu-latest
mpi: intelmpi

# https://github.com/Homebrew/homebrew-core/issues/26974
- platform: macos-12
- platform: macos-13
mpi: mpich

fail-fast: false
Expand Down
8 changes: 3 additions & 5 deletions PyMPDATA_MPI/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@
"""
PyMPDATA + numba-mpi coupler sandbox
"""

from pkg_resources import DistributionNotFound, VersionConflict, get_distribution
from importlib.metadata import PackageNotFoundError, version

try:
__version__ = get_distribution(__name__).version
except (DistributionNotFound, VersionConflict):
# package is not installed
__version__ = version(__name__)
except PackageNotFoundError:
pass
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ classifiers = [
]
dependencies = [
# TODO #94
"numba<0.57.0",
"numpy<1.25.0",
"numba",
"numpy",
"numba_mpi>=0.30",
"PyMPDATA==1.0.16",
"PyMPDATA==1.2.4",
"mpi4py",
"h5py",
]
Expand Down
Loading