Merge pull request #60 from azogue/minor-fixes

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ exclude: >
   )$
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.5
+    rev: v0.3.7
     hooks:
       - id: ruff
         args:

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.11.1] - 🎨 Minor fixes and lint update - 2024-04-12
+
+##### Changes
+
+- 🎨 lint: pre-commit autoupdate + typing fixes
+- 🐛 Fix label color for chart zones
+- 🚀 Bump patch version and update CHANGELOG
+
 ## [0.11.0] - 📦️ Remove scipy dependency - 2024-04-08
 
 ##### Changes

psychrochart/chart.py

@@ -332,7 +332,7 @@ def plot_legend(
         markerscale: float = 0.9,
         frameon: bool = True,
         fancybox: bool = True,
-        edgecolor: str | Iterable = "darkgrey",
+        edgecolor: str | Iterable[float] = "darkgrey",
         fontsize: float = 15.0,
         labelspacing: float = 1.5,
         **params,

psychrochart/plot_logic.py

@@ -180,6 +180,7 @@ def plot_curve(
             assert isinstance(curve.style, ZoneStyle)
             if curve.annotation_style is not None:
                 style_params.update(curve.annotation_style.export_style())
+            style_params["color"] = mod_color(curve.style.edgecolor, -25)
             reg_artist(
                 "label_" + gid_zone,
                 _annotate_label(

pyproject.toml

@@ -17,22 +17,15 @@ plugins = ["pydantic.mypy"]
 follow_imports = "silent"
 warn_redundant_casts = true
 warn_unused_ignores = true
-#disallow_any_generics = true
+disallow_any_generics = true
 check_untyped_defs = true
 no_implicit_reexport = true
 
-# for strict mypy: (this is the tricky one :-))
-# disallow_untyped_defs = true
-
 [tool.pydantic-mypy]
 init_forbid_extra = true
 init_typed = true
 warn_required_dynamic_aliases = true
 
-#profile = "black"
-#force_sort_within_sections = true
-#combine_as_imports = true
-
 [tool.coverage.run]
 branch = true
 source = ["psychrochart"]
@@ -62,7 +55,7 @@ log_date_format = "%Y-%m-%d %H:%M:%S"
 
 [tool.poetry]
 name = "psychrochart"
-version = "0.11.0"
+version = "0.11.1"
 description = "A python 3 library to make psychrometric charts and overlay information on them"
 authors = ["Eugenio Panadero <eugenio.panadero@gmail.com>"]
 packages = [
@@ -90,7 +83,7 @@ keywords=["psychrometrics", "moist", "humid air", "climate control", "matplotlib
 include = ["CHANGELOG.md"]
 
 [tool.poetry.dependencies]
-python = ">=3.10,<3.13"
+python = ">=3.10,<3.14"
 matplotlib = ">=3.7"
 psychrolib = ">=2.5"
 pydantic = ">=2.3.0"

tests/conftest.py

@@ -4,12 +4,15 @@
 import re
 from pathlib import Path
 from time import time
-from typing import Callable
+from typing import Callable, ParamSpec, TypeVar
 
 from matplotlib import rcParams
 
 from psychrochart import PsychroChart
 
+T = TypeVar("T")
+P = ParamSpec("P")
+
 _RG_SVGDATE = re.compile(r"(\s+?<dc:date>.*</dc:date>\s+?)")
 RSC_EXAMPLES = Path(__file__).parent / "example-charts"
 TEST_BASEDIR = Path(__file__).parent / "generated"
@@ -31,10 +34,10 @@ def store_test_chart(
         chart.save(p_svg, metadata={"Date": None})
 
 
-def timeit(msg_log: str) -> Callable:
+def timeit(msg_log: str):
     """Wrap a method to print the execution time of a method call."""
 
-    def _real_deco(func) -> Callable:
+    def _real_deco(func: Callable[P, T]) -> Callable[P, T]:
         def _wrapper(*args, **kwargs):
             tic = time()
             out = func(*args, **kwargs)