Merge branch 'isomorphic-row-col-svg-data' into 'dev'

add row and col data to svg polygons for isomporphic keyboard

See merge request tandav/musiclib!157

.pre-commit-config.yaml

@@ -27,7 +27,7 @@ repos:
       - id: add-trailing-comma
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.2
+    rev: v3.17.0
     hooks:
       - id: pyupgrade
 
@@ -42,26 +42,26 @@ repos:
       - id: autoflake
 
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.4.7
+    rev: v0.6.4
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.0.0
+    rev: 7.1.1
     hooks:
     - id: flake8
       additional_dependencies: [Flake8-pyproject, flake8-functions-names]
 
   - repo: https://github.com/PyCQA/pylint
-    rev: v3.0.3
+    rev: v3.2.7
     hooks:
       - id: pylint
         # additional_dependencies: ["pylint-per-file-ignores"]
         # https://github.com/christopherpickering/pylint-per-file-ignores/issues/76
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.10.0
+    rev: v1.11.2
     hooks:
     - id: mypy
       additional_dependencies:

pyproject.toml

@@ -137,6 +137,7 @@ ignore = [
     "PT011",
     "PT023",
     "N806",
+    "ICN001",
 ]
 
 [tool.ruff.lint.isort]

src/musiclib/midi/parse.py

@@ -149,7 +149,7 @@ def append_bar(noteset: SpecificNoteSet | None) -> None:
         nonlocal t
         for is_play in rhythm.notes:
             if is_play:
-                notes = [note__.i] if noteset is None else [note.i for note in noteset.notes]
+                notes = [note__.i] if noteset is None else [note.i for note in noteset.notes]  # pylint: disable=possibly-used-before-assignment
                 for i, note in enumerate(notes):
                     track.append(mido.Message('note_on', note=note, velocity=100, time=t if i == 0 else 0))
                 for i, note in enumerate(notes):

src/musiclib/progression.py

@@ -67,7 +67,7 @@ def transpose_unique_key(self, *, origin_name: bool = True) -> tuple[frozenset[i
         origin = self[0][0]  # pylint: disable=unsubscriptable-object
         key = tuple(frozenset(note - origin for note in chord.notes) for chord in self)
         if origin_name:
-            return origin.abstract.i, key
+            return origin.abstract.i, key  # pylint: disable=no-member
         return key
 
     def __add__(self, other: int) -> Progression:

src/musiclib/svg/isomorphic/base.py

@@ -236,6 +236,8 @@ def add_key(self, row: float, col: float) -> None:
         polygon.interval = interval  # type: ignore[attr-defined]
         polygon.abstract_interval = abstract_interval.interval  # type: ignore[attr-defined]
         polygon.abstract_interval_base12 = abstract_interval  # type: ignore[attr-defined]
+        polygon.row = row  # type: ignore[attr-defined]
+        polygon.col = col  # type: ignore[attr-defined]
         self.elements.append(polygon)
 
         if self.n_parts is not None:
@@ -262,6 +264,8 @@ def add_key(self, row: float, col: float) -> None:
         polygon.interval = interval  # type: ignore[attr-defined]
         polygon.abstract_interval = abstract_interval.interval  # type: ignore[attr-defined]
         polygon.abstract_interval_base12 = abstract_interval  # type: ignore[attr-defined]
+        polygon.row = row  # type: ignore[attr-defined]
+        polygon.col = col  # type: ignore[attr-defined]
         self.elements.append(polygon)
 
     @abc.abstractmethod

src/musiclib/svg/pianoroll.py

@@ -50,7 +50,7 @@ def __init__(
         self.piano = IsoPiano(
             n_cols=len(self.sns),
             interval_colors=dict.fromkeys(self.sns.intervals, config.WHITE_PALE),
-            interval_strokes=dict.fromkeys(self.sns.intervals, {'stroke': config.BLACK_PALE, 'stroke_width': 0.5}),
+            interval_strokes={i: {'stroke': config.BLACK_PALE, 'stroke_width': 0.5} for i in self.sns.intervals},
             interval_text=FromIntervalDict({i: str(n) for i, n in zip(self.sns.intervals, self.sns.notes_ascending, strict=True)}),
             radius=key_width // 2,
             radius1=key_height // 2,

src/musiclib/voice_leading/checks.py

@@ -101,11 +101,11 @@ def is_make_major_scale_leading_tone_resolving_semitone_up(
     return tonic - leading_tone == 1
 
 
-def is_large_spacing_intervals(c: tuple[int], max_interval: int = 12, /) -> bool:
+def is_large_spacing_intervals(c: tuple[int, ...], max_interval: int = 12, /) -> bool:
     return any(b - a > max_interval for a, b in itertools.pairwise(c))
 
 
-def is_small_spacing_intervals(c: tuple[int], min_interval: int = 3, /) -> bool:
+def is_small_spacing_intervals(c: tuple[int, ...], min_interval: int = 3, /) -> bool:
     return any(b - a < min_interval for a, b in itertools.pairwise(c))
 
 

tests/cache_test.py

@@ -1,6 +1,7 @@
 import operator
 
 import pytest
+
 from musiclib.interval import AbstractInterval
 from musiclib.intervalset import IntervalSet
 from musiclib.note import Note

tests/conftest.py

@@ -1,5 +1,6 @@
 import mido
 import pytest
+
 from musiclib.midi.parse import Midi
 from musiclib.midi.parse import MidiNote
 from musiclib.midi.parse import MidiPitch

tests/interval_test.py

@@ -1,4 +1,5 @@
 import pytest
+
 from musiclib.interval import AbstractInterval
 
 

tests/intervalset_test.py

@@ -1,4 +1,5 @@
 import pytest
+
 from musiclib.interval import AbstractInterval
 from musiclib.intervalset import IntervalSet
 

tests/midi/parse_test.py

@@ -1,5 +1,6 @@
 import mido
 import pytest
+
 from musiclib.midi import parse
 from musiclib.note import SpecificNote
 from musiclib.noteset import SpecificNoteSet

tests/midi/pitchbend_test.py

@@ -1,4 +1,5 @@
 import pytest
+
 from musiclib.midi import pitchbend
 from musiclib.midi.parse import Midi
 from musiclib.midi.parse import MidiNote

tests/midi/player_test.py

@@ -1,4 +1,5 @@
 import pytest
+
 from musiclib.midi.player import Player
 from musiclib.note import SpecificNote
 from musiclib.noteset import SpecificNoteSet

tests/note_test.py

@@ -3,6 +3,7 @@
 import hypothesis.strategies as st
 import pytest
 from hypothesis import given
+
 from musiclib.interval import AbstractInterval
 from musiclib.note import Note
 from musiclib.note import SpecificNote

tests/noteset_test.py

@@ -2,6 +2,7 @@
 from collections.abc import Sequence
 
 import pytest
+
 from musiclib import config
 from musiclib.interval import AbstractInterval
 from musiclib.note import Note

tests/pickle_test.py

@@ -1,6 +1,7 @@
 import pickle
 
 import pytest
+
 from musiclib.interval import AbstractInterval
 from musiclib.intervalset import IntervalSet
 from musiclib.note import Note

tests/pitch_test.py

@@ -1,4 +1,5 @@
 import pytest
+
 from musiclib.note import SpecificNote
 from musiclib.pitch import Pitch
 

tests/progression_test.py

@@ -1,6 +1,7 @@
 from collections.abc import Sequence
 
 import pytest
+
 from musiclib.noteset import SpecificNoteSet
 from musiclib.progression import Progression
 

tests/rhythm_test.py

@@ -1,6 +1,7 @@
 from collections import deque
 
 import pytest
+
 from musiclib.rhythm import Rhythm
 
 

tests/scale_test.py

@@ -1,6 +1,7 @@
 import operator
 
 import pytest
+
 from musiclib import config
 from musiclib.interval import AbstractInterval
 from musiclib.intervalset import IntervalSet

tests/specificnoteset_test.py

@@ -1,6 +1,7 @@
 from collections.abc import Sequence
 
 import pytest
+
 from musiclib import config
 from musiclib.note import SpecificNote
 from musiclib.noteset import NoteSet

tests/svg/isomorphic_test.py

@@ -1,4 +1,5 @@
 import pytest
+
 from musiclib.svg.isomorphic.hexagonal import Hexagonal
 from musiclib.svg.isomorphic.squared import Squared
 

tests/svg/piano_test.py

@@ -3,6 +3,7 @@
 
 import pytest
 from colortool import Color
+
 from musiclib import config
 from musiclib.note import Note
 from musiclib.note import SpecificNote

tests/svg/repr_svg_test.py

@@ -2,6 +2,7 @@
 
 import pytest
 from colortool import Color
+
 from musiclib import config
 from musiclib.noteset import NoteSet
 from musiclib.noteset import SpecificNoteSet

tests/tempo_test.py

@@ -1,6 +1,7 @@
 import typing as tp
 
 import pytest
+
 from musiclib.tempo import Tempo
 
 

tests/util/etc_test.py

@@ -1,4 +1,5 @@
 import pytest
+
 from musiclib.util import etc
 
 

tests/voice_leading/checks_test.py

@@ -1,4 +1,5 @@
 import pytest
+
 from musiclib.noteset import SpecificNoteSet
 from musiclib.voice_leading import checks
 

tests/voice_leading/transition_test.py

@@ -1,6 +1,7 @@
 import itertools
 
 import pytest
+
 from musiclib.note import SpecificNote
 from musiclib.noteset import NoteSet
 from musiclib.noteset import SpecificNoteSet