Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to matplotlib39 #30

Closed
wants to merge 16 commits into from
Closed
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
6 changes: 3 additions & 3 deletions .github/workflows/_code_quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install dependencies
run: pip install -r requirements.txt
- name: Install ruff
run: pip install ruff==0.3.0
run: pip install ruff==0.4.2
- name: Run ruff format
run: ruff format --diff .

Expand All @@ -31,7 +31,7 @@ jobs:
- name: Install dependencies
run: pip install -r requirements.txt
- name: Install ruff
run: pip install ruff==0.3.0
run: pip install ruff==0.4.2
- name: Run ruff check
run: ruff check --diff .

Expand All @@ -49,6 +49,6 @@ jobs:
pip install -r requirements.txt
pip install pytest
- name: Install pyright
run: pip install pyright==1.1.352
run: pip install pyright==1.1.360
- name: Run pyright
run: pyright .
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,21 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e

## [Unreleased]

### Dependencies
* updated to ruff==0.4.2 (from ruff==0.3.0)
* updated to pyright==1.1.360 (from pyright==1.1.352)
* updated to sourcery==1.16 (from sourcery==1.15)
* updated to lxml>=5.2 (from lxml>=5.1)
* updated to types-lxml>=2024.4 (from types-lxml>=5.1)
* updated to scipy>=1.13 (from scipy>=1.12)
* updated to Pillow>=10.3 (from Pillow>=10.2)
* updated to pytest>=8.2 (from pytest>=7.4)
* updated to pytest-cov>=5.0 (from pytest-cov>=4.1)
* updated to Sphinx>=7.3 (from Sphinx>=7.2)
* updated to sphinx-argparse-cli>=1.15 (from sphinx-argparse-cli>=1.11)
* updated to myst-parser>=3.0 (from myst-parser>=2.0)
* updated to furo>=2024.4 (from furo>=2023.9.10)

### Changed
* replaced black formatter with ruff formatter

Expand All @@ -13,6 +28,7 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
* updated to pyright==1.1.352 (from pyright==1.1.350)
* updated to numpy>=1.26,<2.0 (from numpy>=1.26)
* removed black
* updated to matplotlib>=3.9 (from matplotlib>=3.8)

### Changed
* Changed publishing workflow to use OpenID Connect (Trusted Publisher Management) when publishing to PyPI
Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ classifiers = [
"Topic :: Software Development :: Libraries :: Python Modules",
]
dependencies = [
"lxml>=5.1",
"lxml>=5.2",
"numpy>=1.26,<2.0",
"scipy>=1.12",
"scipy>=1.13",
"pandas>=2.2",
"matplotlib>=3.8",
"Pillow>=10.2",
"matplotlib>=3.9",
"Pillow>=10.3",
"pyDOE3>=1.0",
"psutil>=5.9",
"hilbertcurve>=2.0.5",
Expand Down
18 changes: 9 additions & 9 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
pytest>=7.4
pytest-cov>=4.1
ruff==0.3.0
pyright==1.1.352
Sphinx>=7.2
sphinx-argparse-cli>=1.11
myst-parser>=2.0
furo>=2023.9.10
sourcery==1.15
pytest>=8.2
pytest-cov>=5.0
ruff==0.4.2
pyright==1.1.360
Sphinx>=7.3
sphinx-argparse-cli>=1.15
myst-parser>=3.0
furo>=2024.4
sourcery==1.16

-r requirements.txt
-r requirements-types.txt
2 changes: 1 addition & 1 deletion requirements-types.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
types-lxml>=5.1
types-lxml>=2024.4
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
lxml>=5.1
lxml>=5.2
numpy>=1.26,<2.0
scipy>=1.12
scipy>=1.13
pandas>=2.2
matplotlib>=3.8
Pillow>=10.2
matplotlib>=3.9
Pillow>=10.3
pyDOE3>=1.0
psutil>=5.9
hilbertcurve>=2.0.5
Expand Down
4 changes: 2 additions & 2 deletions src/farn/cli/farn.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ def t4(p: Tuple[float, float]) -> Tuple[float, float]:
else:
p = t4(p)
# ImageDraw.Draw(im,)
draw.point(
draw.point( # pyright: ignore [reportUnknownMemberType]
(p[0] * scale + x_offset, p[1] * scale),
fill=(int(rgb[0] * rnd3[0]), int(rgb[1] * rnd3[1]), int(rgb[2] * rnd3[2])),
)
Expand All @@ -284,7 +284,7 @@ def t4(p: Tuple[float, float]) -> Tuple[float, float]:
with tempfile.TemporaryDirectory() as temp_dir:
# im.save(Path(os.getenv('HOME')) / 'splash.png')
temp_file = Path(temp_dir) / "splash.png"
im.save(temp_file)
im.save(temp_file) # pyright: ignore [reportUnknownMemberType]

root = tk.Tk()
root.overrideredirect(True)
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ skip_covered = True
[testenv]
system_site_packages = True
deps =
pytest>=7.4
pytest-cov>=4.1
pytest>=8.2
pytest-cov>=5.0
commands =
pytest --cov --cov-config tox.ini {posargs}
Loading