Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/precommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/readme_snippets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions examples/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ def get_long_description():
"open-atmos-jupyter-utils",
"pystrict",
"matplotlib",
"Pillow",
"joblib",
"ipywidgets",
"seaborn",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading