diff --git a/.github/workflows/precommit.yml b/.github/workflows/precommit.yml index 06bf5fc3b..af0368d63 100644 --- a/.github/workflows/precommit.yml +++ b/.github/workflows/precommit.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v4.1.6 - uses: actions/setup-python@v5.0.0 with: - python-version: 3.9 + python-version: "3.10" - run: | pip install pre-commit pre-commit clean diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 367740116..964e2e433 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -58,10 +58,7 @@ jobs: strategy: matrix: platform: [ ubuntu-latest, macos-latest, windows-latest ] - python-version: [ "3.9", "3.12" ] - exclude: - - platform: macos-14 - python-version: "3.9" + python-version: [ "3.10", "3.12" ] runs-on: ${{ matrix.platform }} needs: [ package ] steps: diff --git a/.github/workflows/readme_snippets.yml b/.github/workflows/readme_snippets.yml index acac7e6d7..a80106833 100644 --- a/.github/workflows/readme_snippets.yml +++ b/.github/workflows/readme_snippets.yml @@ -25,7 +25,6 @@ jobs: python-version: "3.10" - run: python -m pip install $PIP_INSTALL_ARGS -e . - run: python -m pip install $PIP_INSTALL_ARGS pytest-codeblocks pytest - - run: python -m pip install $PIP_INSTALL_ARGS "pillow<11.3.0" # matplotlib triggers deprecation warnings in 11.3.0 - run: | python -c "import os,pytest_codeblocks; code=pytest_codeblocks.extract_from_file('docs/markdown/pysdm_landing.md'); f=open('readme.py', 'w', encoding='utf-8'); f.write('# coding: utf-8'+os.linesep); f.writelines(block.code for block in code if block.syntax=='Python'); f.close()" - run: cat -n readme.py @@ -65,7 +64,7 @@ jobs: - uses: actions/checkout@v4.1.6 - uses: actions/setup-python@v5.0.0 with: - python-version: 3.9 + python-version: "3.10" - run: pip install -e . - run: pip install pytest-codeblocks pytest - run: python -c "import pytest_codeblocks; code=pytest_codeblocks.extract_from_file('docs/markdown/pysdm_landing.md'); f=open('readme.m', 'w'); f.writelines(block.code for block in code if block.syntax=='Matlab'); f.close()" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 52e4d9ee5..aa149bdf6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,7 +26,7 @@ jobs: strategy: matrix: platform: [ ubuntu-24.04, macos-15-intel, macos-14, windows-latest ] - python-version: [ "3.9", "3.12" ] + python-version: [ "3.10", "3.12" ] runs-on: ${{ matrix.platform }} steps: - uses: actions/checkout@v4.1.6 @@ -45,7 +45,7 @@ jobs: python-version: ["3.12"] include: # for pylint - platform: ubuntu-24.04 - python-version: "3.9" + python-version: "3.10" runs-on: ${{ matrix.platform }} steps: - uses: actions/checkout@v4.1.6 @@ -62,7 +62,7 @@ jobs: strategy: matrix: platform: [ubuntu-24.04] - python-version: ["3.9"] + python-version: ["3.10"] runs-on: ${{ matrix.platform }} steps: - uses: actions/checkout@v4.1.6 @@ -91,7 +91,7 @@ jobs: strategy: matrix: platform: [ ubuntu-24.04, macos-15-intel, macos-14, windows-latest ] - python-version: [ "3.9", "3.12" ] + python-version: [ "3.10", "3.12" ] runs-on: ${{ matrix.platform }} env: NUMBA_DISABLE_JIT: 1 diff --git a/examples/setup.py b/examples/setup.py index 6319245d4..3f385bc6e 100644 --- a/examples/setup.py +++ b/examples/setup.py @@ -28,7 +28,6 @@ def get_long_description(): "open-atmos-jupyter-utils", "pystrict", "matplotlib", - "Pillow", "joblib", "ipywidgets", "seaborn", @@ -45,7 +44,6 @@ def get_long_description(): "open-atmos-jupyter-utils==1.3.0", "pystrict==1.3", "matplotlib!=3.9.1", - "Pillow<11.3.0", "joblib==1.5.1", "ipywidgets==8.1.7", "seaborn==0.13.2", diff --git a/setup.py b/setup.py index d45a977ad..f57562c73 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ ] optional_dependencies = { - "unit-tests": ["pytest", "pytest-timeout", "matplotlib!=3.9.1", "Pillow<11.3.0"], + "unit-tests": ["pytest", "pytest-timeout", "matplotlib!=3.9.1"], "nonunit-tests": ["pytest", "PySDM-examples", "PyPartMC"], "CI_version_pins": [ "PyPartMC==1.7.2",