diff --git a/.github/workflows/test-all.yml b/.github/workflows/test-all.yml index 0d85edb6..86536232 100644 --- a/.github/workflows/test-all.yml +++ b/.github/workflows/test-all.yml @@ -18,12 +18,12 @@ jobs: matrix: os: [ubuntu-24.04] - python-version: ["3.10", "3.12"] + python-version: ["3.10", "3.14"] backend: [numpy, jax] env: PYOM2_DIR: /home/runner/pyom2 - PETSC_VERSION: "3.23.3" + PETSC_VERSION: "3.24.5" OMPI_MCA_rmaps_base_oversubscribe: "1" OMPI_MCA_mpi_yield_when_idle: "1" VEROS_REQUIRE_CYTHON_EXT: "1" @@ -77,9 +77,10 @@ jobs: - name: Install optional requirements run: | - # PETSc has issues with mpi4py v4 - pip install "mpi4py<4" - pip install mpi4jax --no-build-isolation + pip install mpi4py nanobind + if [ ${{ matrix.backend }} == "jax" ]; then + pip install mpi4jax --no-build-isolation + fi pip install petsc==$PETSC_VERSION --no-build-isolation pip install petsc4py==$PETSC_VERSION --no-build-isolation diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml index e4f0e038..a313917a 100644 --- a/.github/workflows/test-install.yml +++ b/.github/workflows/test-install.yml @@ -20,7 +20,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ["3.10", "3.12"] + python-version: ["3.10", "3.14"] nocc: [false] include: diff --git a/conda-environment.yml b/conda-environment.yml index 4b4d126a..6b08936c 100644 --- a/conda-environment.yml +++ b/conda-environment.yml @@ -5,7 +5,7 @@ channels: - nodefaults dependencies: - - python=3.12 + - python=3.13 - pip>=24.0 - click - entrypoints diff --git a/requirements_jax.txt b/requirements_jax.txt index aa8a8ed0..2a4be08c 100644 --- a/requirements_jax.txt +++ b/requirements_jax.txt @@ -1 +1 @@ -jax==0.9.0.1 +jax==0.9.1 diff --git a/setup.py b/setup.py index 433a2cdd..ef98004f 100644 --- a/setup.py +++ b/setup.py @@ -25,6 +25,8 @@ Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 Programming Language :: Python :: 3.12 +Programming Language :: Python :: 3.13 +Programming Language :: Python :: 3.14 Programming Language :: Python :: Implementation :: CPython Topic :: Scientific/Engineering Operating System :: Microsoft :: Windows