From 88168172f85bf1b689472192832497f4949636d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Oct 2025 14:16:15 +0000 Subject: [PATCH 1/4] Update pillow requirement from <11.3.0 to <12.1.0 in /examples Updates the requirements on [pillow](https://github.com/python-pillow/Pillow) to permit the latest version. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/1.0...12.0.0) --- updated-dependencies: - dependency-name: pillow dependency-version: 12.0.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- examples/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/setup.py b/examples/setup.py index 6319245d4..bd70272de 100644 --- a/examples/setup.py +++ b/examples/setup.py @@ -45,7 +45,7 @@ def get_long_description(): "open-atmos-jupyter-utils==1.3.0", "pystrict==1.3", "matplotlib!=3.9.1", - "Pillow<11.3.0", + "Pillow<12.1.0", "joblib==1.5.1", "ipywidgets==8.1.7", "seaborn==0.13.2", From 65e9620800e6981996b03473e7610c28bd885ef5 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Sat, 15 Nov 2025 23:49:42 +0100 Subject: [PATCH 2/4] try removing all Pillow pkg references (should be implied!) --- .github/workflows/readme_snippets.yml | 1 - examples/setup.py | 2 -- setup.py | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/readme_snippets.yml b/.github/workflows/readme_snippets.yml index 21524cb1b..f5c115f98 100644 --- a/.github/workflows/readme_snippets.yml +++ b/.github/workflows/readme_snippets.yml @@ -26,7 +26,6 @@ jobs: - 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 "pyparsing<3.0.0" # https://github.com/matplotlib/matplotlib/issues/25204 - - 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 diff --git a/examples/setup.py b/examples/setup.py index bd70272de..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<12.1.0", "joblib==1.5.1", "ipywidgets==8.1.7", "seaborn==0.13.2", diff --git a/setup.py b/setup.py index 3c447d412..c3e613b6b 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,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", From abddbd14e4c7256a64e0d9011e2a723624bace39 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Mon, 17 Nov 2025 11:01:08 +0100 Subject: [PATCH 3/4] shift from EOL Python 3.9 to 3.10 in CI --- .github/workflows/precommit.yml | 2 +- .github/workflows/pypi.yml | 5 +---- .github/workflows/readme_snippets.yml | 2 +- .github/workflows/tests.yml | 8 ++++---- 4 files changed, 7 insertions(+), 10 deletions(-) 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 2da454f59..922d54ec6 100644 --- a/.github/workflows/readme_snippets.yml +++ b/.github/workflows/readme_snippets.yml @@ -65,7 +65,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 From faaa4a876d02ffc2d3d2ba6bc4de984338c3c4f4 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Mon, 17 Nov 2025 11:03:25 +0100 Subject: [PATCH 4/4] remove unintended line --- .github/workflows/readme_snippets.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/readme_snippets.yml b/.github/workflows/readme_snippets.yml index 922d54ec6..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 "pyparsing<3.0.0" # https://github.com/matplotlib/matplotlib/issues/25204 - 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