From 7655b152dffafdd74a80ed13afad5c025ba00fa2 Mon Sep 17 00:00:00 2001 From: sfonxu Date: Mon, 4 Nov 2024 11:40:20 +0100 Subject: [PATCH 1/7] bump python version to 3.12 --- .github/workflows/tests+pypi.yml | 4 ++-- pyproject.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests+pypi.yml b/.github/workflows/tests+pypi.yml index 801209f..4d63640 100644 --- a/.github/workflows/tests+pypi.yml +++ b/.github/workflows/tests+pypi.yml @@ -90,7 +90,7 @@ jobs: matrix: platform: [ubuntu-latest, macos-12] 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 @@ -156,7 +156,7 @@ jobs: matrix: platform: [ubuntu-latest, macos-12] mpi: [ 'mpich', 'openmpi', 'intelmpi'] - python-version: ["3.10"] + python-version: ["3.10", "3.12"] disable-jit: [1, 0] mpi-np: [1, 2, 3] exclude: diff --git a/pyproject.toml b/pyproject.toml index 52b45d8..5c3d287 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ ] dependencies = [ # TODO #94 - "numba<0.57.0", - "numpy<1.25.0", + "numba==0.59.1", + "numpy==1.26.4", "numba_mpi>=0.30", "PyMPDATA==1.0.16", "mpi4py", From e256d56df78a8dfb56214fe8260a4fe20fd8fc97 Mon Sep 17 00:00:00 2001 From: sfonxu Date: Mon, 4 Nov 2024 12:02:57 +0100 Subject: [PATCH 2/7] changes pkg_resources to importlib --- PyMPDATA_MPI/__init__.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/PyMPDATA_MPI/__init__.py b/PyMPDATA_MPI/__init__.py index 348a4f7..96b4351 100644 --- a/PyMPDATA_MPI/__init__.py +++ b/PyMPDATA_MPI/__init__.py @@ -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 From 9f3d2cbc57d82264332614eff730544c7fb0f376 Mon Sep 17 00:00:00 2001 From: sfonxu Date: Mon, 4 Nov 2024 12:29:31 +0100 Subject: [PATCH 3/7] bumped h5py version --- .github/workflows/tests+pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests+pypi.yml b/.github/workflows/tests+pypi.yml index 4d63640..0c987f9 100644 --- a/.github/workflows/tests+pypi.yml +++ b/.github/workflows/tests+pypi.yml @@ -140,7 +140,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 From d43a3fc46c86139275e19a839756399837b164d6 Mon Sep 17 00:00:00 2001 From: sfonxu Date: Mon, 4 Nov 2024 12:56:30 +0100 Subject: [PATCH 4/7] excluded python 3.12 for macos --- .github/workflows/tests+pypi.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests+pypi.yml b/.github/workflows/tests+pypi.yml index 0c987f9..9d5269a 100644 --- a/.github/workflows/tests+pypi.yml +++ b/.github/workflows/tests+pypi.yml @@ -95,7 +95,8 @@ jobs: # as of time of writing, mpi4py/setup-mpi does not support it - platform: macos-12 mpi: intelmpi - + - platform: macos-12 + python-version: "3.12" # issues with: *** The MPI_Comm_rank() function was called before MPI_INIT was invoked. - platform: ubuntu-latest mpi: intelmpi @@ -163,6 +164,8 @@ jobs: # as of time of writing, mpi4py/setup-mpi does not support it - platform: macos-12 mpi: intelmpi + - platform: macos-12 + python-version: "3.12" # issues with: *** The MPI_Comm_rank() function was called before MPI_INIT was invoked. - platform: ubuntu-latest From aba7971b60ed07e9b2eb9975411376ec4d5a65ad Mon Sep 17 00:00:00 2001 From: sfonxu Date: Mon, 4 Nov 2024 13:44:20 +0100 Subject: [PATCH 5/7] fixed yaml formatting --- .github/workflows/tests+pypi.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests+pypi.yml b/.github/workflows/tests+pypi.yml index 9d5269a..5b6633f 100644 --- a/.github/workflows/tests+pypi.yml +++ b/.github/workflows/tests+pypi.yml @@ -95,8 +95,8 @@ jobs: # as of time of writing, mpi4py/setup-mpi does not support it - platform: macos-12 mpi: intelmpi - - platform: macos-12 - python-version: "3.12" + - platform: macos-12 + python-version: "3.12" # issues with: *** The MPI_Comm_rank() function was called before MPI_INIT was invoked. - platform: ubuntu-latest mpi: intelmpi @@ -164,8 +164,8 @@ jobs: # as of time of writing, mpi4py/setup-mpi does not support it - platform: macos-12 mpi: intelmpi - - platform: macos-12 - python-version: "3.12" + - platform: macos-12 + python-version: "3.12" # issues with: *** The MPI_Comm_rank() function was called before MPI_INIT was invoked. - platform: ubuntu-latest From 3edf0db169b0f6be054df2a6939dc9de816a2c83 Mon Sep 17 00:00:00 2001 From: sfonxu Date: Wed, 13 Nov 2024 11:27:23 +0100 Subject: [PATCH 6/7] remove version specifications to rely on pympdatas' spec --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5c3d287..012647d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,10 +26,10 @@ classifiers = [ ] dependencies = [ # TODO #94 - "numba==0.59.1", - "numpy==1.26.4", + "numba", + "numpy", "numba_mpi>=0.30", - "PyMPDATA==1.0.16", + "PyMPDATA==1.2.4", "mpi4py", "h5py", ] From 87ad0fdc21af6138ffd0a8b98b74b9c623c8f972 Mon Sep 17 00:00:00 2001 From: sfonxu Date: Wed, 13 Nov 2024 11:29:36 +0100 Subject: [PATCH 7/7] change macos version to 13 --- .github/workflows/tests+pypi.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests+pypi.yml b/.github/workflows/tests+pypi.yml index 5b6633f..1be62b6 100644 --- a/.github/workflows/tests+pypi.yml +++ b/.github/workflows/tests+pypi.yml @@ -88,21 +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", "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-12 + - 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 }} @@ -155,16 +155,16 @@ 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", "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-12 + - platform: macos-13 python-version: "3.12" # issues with: *** The MPI_Comm_rank() function was called before MPI_INIT was invoked. @@ -172,7 +172,7 @@ jobs: mpi: intelmpi # https://github.com/Homebrew/homebrew-core/issues/26974 - - platform: macos-12 + - platform: macos-13 mpi: mpich fail-fast: false