diff --git a/.github/workflows/readme_python.yml b/.github/workflows/readme_python.yml index aca45180..fbdf816a 100644 --- a/.github/workflows/readme_python.yml +++ b/.github/workflows/readme_python.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v1 with: - python-version: "3.10" + python-version: "3.11" - run: pip install -e . - run: pip install pytest-codeblocks pytest matplotlib - run: python -c "import pytest_codeblocks; code=pytest_codeblocks.extract_from_file('docs/markdown/pympdata_landing.md'); f=open('readme.py', 'w'); f.writelines(block.code for block in code if block.syntax=='Python'); f.close()" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 51fd64bc..a0cfd71a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v5.2.0 with: - python-version: "3.10" + python-version: "3.11" - run: | pip install pre-commit pre-commit clean @@ -42,7 +42,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5.2.0 with: - python-version: "3.10" + python-version: "3.11" - name: Set up MPI uses: mpi4py/setup-mpi@v1 - name: Install dependencies @@ -83,7 +83,7 @@ jobs: needs: [ precommit, pylint, devops ] strategy: matrix: - python-version: ["3.10", "3.13.12"] + python-version: ["3.11", "3.13.12"] runs-on: ubuntu-latest env: NUMBA_DISABLE_JIT: 1 @@ -103,7 +103,7 @@ jobs: pip install pytest-cov pytest --durations=10 -We tests/unit_tests --cov-report=xml --cov=PyMPDATA - name: Upload coverage to Codecov - uses: codecov/codecov-action@v5.5.2 + uses: codecov/codecov-action@v7.0.0 with: env_vars: PYTHON,MPI token: ${{ secrets.CODECOV_TOKEN }} @@ -115,10 +115,10 @@ jobs: strategy: matrix: platform: [ubuntu-latest, macos-15-intel, macos-14, windows-latest] - python-version: ["3.10", "3.13.12"] + python-version: ["3.11", "3.13.12"] exclude: - platform: macos-14 - python-version: "3.10" + python-version: "3.11" runs-on: ${{ matrix.platform }} timeout-minutes: ${{ startsWith(matrix.platform, 'windows-') && 115 || 90 }} steps: @@ -156,7 +156,7 @@ jobs: strategy: matrix: platform: [ubuntu-latest, macos-15-intel, macos-14, windows-latest] - python-version: ["3.10", "3.13.12"] + python-version: ["3.11", "3.13.12"] fail-fast: false runs-on: ${{ matrix.platform }} steps: diff --git a/MPI/pyproject.toml b/MPI/pyproject.toml index 04e2b477..f2ba4d3e 100644 --- a/MPI/pyproject.toml +++ b/MPI/pyproject.toml @@ -7,7 +7,7 @@ local_scheme = "no-local-version" version_scheme = "post-release" [build-system] -requires = ['setuptools==80.3.1', 'setuptools-scm==8.3.1'] +requires = ['setuptools==84.0', 'setuptools-scm==10.3'] build-backend = "setuptools.build_meta" [project] diff --git a/examples/PyMPDATA_examples/trixi_comparison/advection_comparison.ipynb b/examples/PyMPDATA_examples/trixi_comparison/advection_comparison.ipynb index 80aeb44e..5366d37d 100644 --- a/examples/PyMPDATA_examples/trixi_comparison/advection_comparison.ipynb +++ b/examples/PyMPDATA_examples/trixi_comparison/advection_comparison.ipynb @@ -129,10 +129,11 @@ "source": [ "%%writefile trixi.jl\n", "import Pkg\n", - "Pkg.add([\"JSON\", \"Trixi\", \"OrdinaryDiffEq\", \"Trixi2Vtk\"])\n", + "Pkg.add([\"JSON\", \"Trixi\", \"OrdinaryDiffEq\", \"Trixi2Vtk\", \"OrdinaryDiffEqLowStorageRK\"])\n", "using JSON\n", "using Trixi\n", "using OrdinaryDiffEq\n", + "using OrdinaryDiffEqLowStorageRK\n", "using Trixi2Vtk\n", "\n", "setup = JSON.parsefile(\"./setup.json\")\n", diff --git a/examples/pyproject.toml b/examples/pyproject.toml index 832bc4a0..4ffdc0eb 100644 --- a/examples/pyproject.toml +++ b/examples/pyproject.toml @@ -4,4 +4,4 @@ local_scheme = "no-local-version" version_scheme = "post-release" [build-system] -requires = ['setuptools==80.3.1', 'setuptools-scm==10.0.5'] +requires = ['setuptools==84.0', 'setuptools-scm==10.3'] diff --git a/pyproject.toml b/pyproject.toml index a4d4f3b4..1a3ad725 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,4 +6,4 @@ local_scheme = "no-local-version" version_scheme = "post-release" [build-system] -requires = ['setuptools==80.3.1', 'setuptools-scm==10.0.5'] +requires = ['setuptools==84.0', 'setuptools-scm==10.3'] diff --git a/setup.py b/setup.py index cb0581a9..5c391242 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,6 @@ def get_long_description(): "numba" + ( { - 10: "<0.57.0", 11: "==0.58.1", 12: "==0.59.1", 13: "==0.61.2", @@ -39,8 +38,7 @@ def get_long_description(): "numpy" + ( { - 10: "<1.24", - 11: "==1.24.4", + 11: "==1.26.4", 12: "==1.26.4", 13: "==2.2.5", }[sys.version_info.minor] @@ -68,7 +66,7 @@ def get_long_description(): "jupyter-core" + ("<5.0.0" if CI else ""), "jupyter_client" + ("==8.6.3" if CI else ""), "ipywidgets" + ("==8.1.7" if CI else ""), - "ipykernel" + ("==7.0.0a1" if CI else ""), + "ipykernel" + ("==7.0.1" if CI else ""), "ghapi", "pytest", "pytest-benchmark",