mtg-ssm 2.6.12.dev4__tar.gz → 2.7.0__tar.gz

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/.github/workflows/integration.yml

@@ -24,7 +24,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: "3.13"
           cache: pip
           cache-dependency-path: |
             pyproject.toml

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/.github/workflows/pre-commit.yml

@@ -15,7 +15,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.9"
           cache: pip
           cache-dependency-path: pyproject.toml
 

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/.github/workflows/publish.yml

@@ -23,7 +23,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: "3.9"
 
       - name: Install pypa/build
         run: >-

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/.github/workflows/run-tests.yml

@@ -11,11 +11,11 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
+          - "3.13"
         os:
           - ubuntu-latest
           - macos-latest
@@ -44,11 +44,11 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
+          - "3.13"
     name: Python ${{ matrix.python-version }} pytest
     steps:
       - uses: actions/checkout@v4

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: mtg_ssm
-Version: 2.6.12.dev4
+Version: 2.7.0
 Summary: A tool to manage Magic: the Gathering collection spreadsheets
 Author-email: George Leslie-Waksman <waksman@gmail.com>
 License: MIT
@@ -19,18 +19,18 @@ Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Games/Entertainment
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: appdirs~=1.4
 Requires-Dist: msgspec~=0.15
-Requires-Dist: openpyxl~=3.0
+Requires-Dist: openpyxl~=3.1
 Requires-Dist: requests~=2.27
 Requires-Dist: requests-cache~=0.9.8
 Requires-Dist: typing_extensions~=4.8.0
@@ -240,6 +240,12 @@ Development
 
 -   ...
 
+2.7.0
+-----
+
+-   Drop support for Python 3.8
+-   Add support for Python 3.13
+
 2.6.9
 -----
 

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/README.rst

@@ -179,6 +179,12 @@ Development
 
 -   ...
 
+2.7.0
+-----
+
+-   Drop support for Python 3.8
+-   Add support for Python 3.13
+
 2.6.9
 -----
 

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/mtg_ssm/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.6.12.dev4'
-__version_tuple__ = version_tuple = (2, 6, 12, 'dev4')
+__version__ = version = '2.7.0'
+__version_tuple__ = version_tuple = (2, 7, 0)

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/mtg_ssm/containers/bundles.py

@@ -1,30 +1,24 @@
 """Data bundle definitions."""
 
 import copy
-from typing import List, NamedTuple, Optional, Set
+from typing import NamedTuple, Optional
 
-from mtg_ssm.scryfall.models import (
-    ScryCard,
-    ScryCardLayout,
-    ScryMigration,
-    ScrySet,
-    ScrySetType,
-)
+from mtg_ssm.scryfall.models import ScryCard, ScryCardLayout, ScryMigration, ScrySet, ScrySetType
 
 
 class ScryfallDataSet(NamedTuple):
     """Bundle for storing Scryfall data."""
 
-    sets: List[ScrySet]
-    cards: List[ScryCard]
-    migrations: List[ScryMigration]
+    sets: list[ScrySet]
+    cards: list[ScryCard]
+    migrations: list[ScryMigration]
 
 
 def filter_cards_and_sets(  # noqa: C901
     scryfall_data: ScryfallDataSet,
     *,
-    exclude_set_types: Optional[Set[ScrySetType]] = None,
-    exclude_card_layouts: Optional[Set[ScryCardLayout]] = None,
+    exclude_set_types: Optional[set[ScrySetType]] = None,
+    exclude_card_layouts: Optional[set[ScryCardLayout]] = None,
     exclude_digital: bool = False,
     exclude_foreing_only: bool = False,
     merge_promos: bool = False,

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/mtg_ssm/containers/counts.py

@@ -2,7 +2,8 @@
 
 import collections
 import enum
-from typing import Any, Dict, Iterable, MutableMapping
+from collections.abc import Iterable, MutableMapping
+from typing import Any
 from uuid import UUID
 
 from mtg_ssm.containers import legacy
@@ -24,12 +25,12 @@ class CountType(str, enum.Enum):
     FOIL = "foil"
 
 
-ScryfallCardCount = Dict[UUID, MutableMapping[CountType, int]]
+ScryfallCardCount = dict[UUID, MutableMapping[CountType, int]]
 """Mapping from scryfall id to card printing type to count."""
 
 
 def aggregate_card_counts(
-    card_rows: Iterable[Dict[str, Any]], oracle: Oracle
+    card_rows: Iterable[dict[str, Any]], oracle: Oracle
 ) -> ScryfallCardCount:
     """Extract card counts from card rows."""
     card_counts: ScryfallCardCount = {}

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/mtg_ssm/containers/indexes.py

@@ -2,7 +2,8 @@
 
 import collections
 import string
-from typing import Dict, Iterable, List, Optional, Set, Tuple
+from collections.abc import Iterable
+from typing import Optional
 from uuid import UUID
 
 from mtg_ssm.containers.bundles import ScryfallDataSet
@@ -10,21 +11,21 @@ from mtg_ssm.mtg import util
 from mtg_ssm.scryfall.models import ScryCard, ScryMigrationStrategy, ScrySet
 
 
-def name_card_sort_key(card: ScryCard) -> Tuple[str, str, int, str]:
+def name_card_sort_key(card: ScryCard) -> tuple[str, str, int, str]:
     """Key function for sorting cards in a by-name list."""
     return (card.set, *util.collector_number_parts(card.collector_number))
 
 
-def set_card_sort_key(card: ScryCard) -> Tuple[str, int, str]:
+def set_card_sort_key(card: ScryCard) -> tuple[str, int, str]:
     """Key function for sorting cards in a by-set list."""
     return util.collector_number_parts(card.collector_number)
 
 
 def build_snnmas(
     card: ScryCard,
-) -> Iterable[Tuple[Optional[str], str, Optional[str], Optional[int], Optional[str]]]:
+) -> Iterable[tuple[Optional[str], str, Optional[str], Optional[int], Optional[str]]]:
     """Build set, name, number, multiverse id tuple keys."""
-    names_cnums: Set[Tuple[str, Optional[str]]] = {(card.name, card.collector_number)}
+    names_cnums: set[tuple[str, Optional[str]]] = {(card.name, card.collector_number)}
     for i, card_face in enumerate(card.card_faces or ()):
         names_cnums |= {
             (card_face.name, card.collector_number),
@@ -32,11 +33,11 @@ def build_snnmas(
         }
     names_cnums |= {(n, None) for n, _ in names_cnums}
 
-    sets: Set[Optional[str]] = {card.set, None}
+    sets: set[Optional[str]] = {card.set, None}
 
-    mvids: Set[Optional[int]] = {None} | set(card.multiverse_ids or ())
+    mvids: set[Optional[int]] = {None} | set(card.multiverse_ids or ())
 
-    artists: Set[Optional[str]] = {card.artist, None}
+    artists: set[Optional[str]] = {card.artist, None}
 
     for name, number in names_cnums:
         for set_ in sets:
@@ -49,18 +50,18 @@ class ScryfallDataIndex:
     """Card and set indexes for scryfall data."""
 
     def __init__(self) -> None:
-        self.id_to_card: Dict[UUID, ScryCard] = {}
-        self.name_to_cards: Dict[str, List[ScryCard]] = {}
-        self.setcode_to_cards: Dict[str, List[ScryCard]] = {}
-        self.id_to_setindex: Dict[UUID, int] = {}
-        self.setcode_to_set: Dict[str, ScrySet] = {}
-        self.migrate_old_id_to_new_id: Dict[UUID, UUID] = {}
+        self.id_to_card: dict[UUID, ScryCard] = {}
+        self.name_to_cards: dict[str, list[ScryCard]] = {}
+        self.setcode_to_cards: dict[str, list[ScryCard]] = {}
+        self.id_to_setindex: dict[UUID, int] = {}
+        self.setcode_to_set: dict[str, ScrySet] = {}
+        self.migrate_old_id_to_new_id: dict[UUID, UUID] = {}
         # snnma = Set, Name, (Collector) Number, Multiverse ID, Artist
         # TODO: convert to intersecting bitmap indexes
         # TODO: do we really need artist?
-        self.snnma_to_id: Dict[
-            Tuple[Optional[str], str, Optional[str], Optional[int], Optional[str]],
-            Set[UUID],
+        self.snnma_to_id: dict[
+            tuple[Optional[str], str, Optional[str], Optional[int], Optional[str]],
+            set[UUID],
         ] = {}
 
     def load_data(self, scrydata: ScryfallDataSet) -> None:
@@ -71,8 +72,8 @@ class ScryfallDataIndex:
 
         self.snnma_to_id = collections.defaultdict(set)
 
-        name_to_unsorted_cards: Dict[str, List[ScryCard]] = collections.defaultdict(list)
-        setcode_to_unsorted_cards: Dict[str, List[ScryCard]] = {}
+        name_to_unsorted_cards: dict[str, list[ScryCard]] = collections.defaultdict(list)
+        setcode_to_unsorted_cards: dict[str, list[ScryCard]] = {}
 
         for set_ in scrydata.sets:
             self.setcode_to_set[set_.code] = set_

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/mtg_ssm/containers/legacy.py

@@ -1,6 +1,6 @@
 """Legacy record lookup capabilities for older file versions."""
 
-from typing import Any, Dict, List, Optional, Set, Tuple
+from typing import Any, Optional
 from uuid import UUID
 
 from mtg_ssm.containers.indexes import Oracle
@@ -19,13 +19,13 @@ class MultipleMatchError(Error):
     """Raised when multiple matching cards are found."""
 
 
-COUNT_TYPE_TO_OLD_COUNT_TYPES: Dict[str, Set[str]] = {
+COUNT_TYPE_TO_OLD_COUNT_TYPES: dict[str, set[str]] = {
     "nonfoil": {"nonfoil", "copies"},
     "foil": {"foil", "foils"},
 }
 
 
-def extract_counts(card_row: Dict[str, Any]) -> Dict[str, int]:
+def extract_counts(card_row: dict[str, Any]) -> dict[str, int]:
     """Convert old count type names to new count type names."""
     renamed_counts = {
         k: sum(int(card_row.get(t) or 0) for t in v)
@@ -93,13 +93,13 @@ OTHER_SET_CODE_TO_SET_CODE = {
     "PCA": ["opca"],
 }
 
-PSUDONYM_TO_ARTIST: Dict[Optional[str], str] = {
+PSUDONYM_TO_ARTIST: dict[Optional[str], str] = {
     "William Murai": "Willian Murai",
     "Dave Seeley": "David Seeley",
 }
 
 
-def find_scryfall_id(card_row: Dict[str, str], oracle: Oracle) -> UUID:
+def find_scryfall_id(card_row: dict[str, str], oracle: Oracle) -> UUID:
     """Heuristically determine the scryfall id for a given input row."""
     set_code = card_row.get("set", "")
     set_codes = [
@@ -113,7 +113,7 @@ def find_scryfall_id(card_row: Dict[str, str], oracle: Oracle) -> UUID:
     artist = card_row.get("artist") or None
     artist = PSUDONYM_TO_ARTIST.get(artist, artist)
     print(f"Searching => Set: {set_code}; Name: {name}; Number: {collector_number}; MVID: {mvid}")
-    snnma_keys: List[Tuple[Optional[str], str, Optional[str], Optional[int], Optional[str]]] = []
+    snnma_keys: list[tuple[Optional[str], str, Optional[str], Optional[int], Optional[str]]] = []
     for set_ in set_codes:
         snnma_keys += [
             (set_, name, collector_number, None, None),
@@ -145,7 +145,7 @@ def find_scryfall_id(card_row: Dict[str, str], oracle: Oracle) -> UUID:
     raise NoMatchError(msg)
 
 
-def coerce_row(card_row: Dict[str, Any], oracle: Oracle) -> Dict[str, Any]:
+def coerce_row(card_row: dict[str, Any], oracle: Oracle) -> dict[str, Any]:
     """Coerce an unknown older row into a current row.
 
     If this cannot be done precisely, a warning will be displayed.

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/mtg_ssm/mtg/util.py

@@ -2,15 +2,14 @@
 
 import functools
 import re
-from typing import Tuple
 
 STRICT_BASICS = frozenset({"Plains", "Island", "Swamp", "Mountain", "Forest"})
 
 COLLECTOR_NUMBER_RE = re.compile(r"(?P<prefix>.*-|\D+)?(?P<number>\d+)?(?P<suffix>\D.*)?")
 
 
-@functools.lru_cache(maxsize=None)
-def collector_number_parts(collector_number: str) -> Tuple[str, int, str]:
+@functools.cache
+def collector_number_parts(collector_number: str) -> tuple[str, int, str]:
     """Split a collector number into its parts."""
     match = COLLECTOR_NUMBER_RE.match(collector_number)
     if not match:

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/mtg_ssm/scryfall/fetcher.py

@@ -2,20 +2,13 @@
 
 import gzip
 import os
-from typing import List
 
 import appdirs
 import msgspec
 from requests_cache import CachedSession, SerializerPipeline, Stage, pickle_serializer
 
 from mtg_ssm.containers.bundles import ScryfallDataSet
-from mtg_ssm.scryfall.models import (
-    ScryBulkData,
-    ScryCard,
-    ScryList,
-    ScryMigration,
-    ScrySet,
-)
+from mtg_ssm.scryfall.models import ScryBulkData, ScryCard, ScryList, ScryMigration, ScrySet
 
 APP_AUTHOR = "gwax"
 APP_NAME = "mtg_ssm"
@@ -75,6 +68,6 @@ def scryfetch() -> ScryfallDataSet:
         migrations_data += migrations_list.data
 
     [cards_endpoint] = [bd.download_uri for bd in bulk_data if bd.type == BULK_TYPE]
-    cards_data = msgspec.json.decode(_fetch_endpoint(cards_endpoint), type=List[ScryCard])
+    cards_data = msgspec.json.decode(_fetch_endpoint(cards_endpoint), type=list[ScryCard])
 
     return ScryfallDataSet(sets=sets_data, cards=cards_data, migrations=migrations_data)

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/mtg_ssm/scryfall/models.py

@@ -5,7 +5,7 @@
 import datetime as dt
 from decimal import Decimal
 from enum import Enum
-from typing import Dict, Generic, List, Optional, TypeVar, Union
+from typing import Generic, Optional, TypeVar, Union
 from uuid import UUID
 
 from msgspec import Struct
@@ -299,12 +299,12 @@ class ScryCardFace(
     artist: Optional[str] = None
     artist_id: Optional[UUID] = None
     cmc: Optional[float] = None
-    color_indicator: Optional[List[ScryColor]] = None
-    colors: Optional[List[ScryColor]] = None
+    color_indicator: Optional[list[ScryColor]] = None
+    colors: Optional[list[ScryColor]] = None
     flavor_name: Optional[str] = None
     flavor_text: Optional[str] = None
     illustration_id: Optional[UUID] = None
-    image_uris: Optional[Dict[str, str]] = None
+    image_uris: Optional[dict[str, str]] = None
     layout: Optional[ScryCardLayout] = None
     loyalty: Optional[str] = None
     mana_cost: str
@@ -343,7 +343,7 @@ class ScryCard(
     lang: str
     mtgo_id: Optional[int] = None
     mtgo_foil_id: Optional[int] = None
-    multiverse_ids: Optional[List[int]] = None
+    multiverse_ids: Optional[list[int]] = None
     tcgplayer_id: Optional[int] = None
     tcgplayer_etched_id: Optional[int] = None
     cardmarket_id: Optional[int] = None
@@ -353,18 +353,18 @@ class ScryCard(
     scryfall_uri: str
     uri: str
     # Gameplay Fields
-    all_parts: Optional[List[ScryRelatedCard]] = None
-    card_faces: Optional[List[ScryCardFace]] = None
+    all_parts: Optional[list[ScryRelatedCard]] = None
+    card_faces: Optional[list[ScryCardFace]] = None
     cmc: Optional[float] = None
-    colors: Optional[List[ScryColor]] = None
-    color_identity: List[ScryColor]
-    color_indicator: Optional[List[ScryColor]] = None
+    colors: Optional[list[ScryColor]] = None
+    color_identity: list[ScryColor]
+    color_indicator: Optional[list[ScryColor]] = None
     edhrec_rank: Optional[int] = None
     foil: bool
     hand_modifier: Optional[str] = None
-    keywords: List[str]
+    keywords: list[str]
     layout: ScryCardLayout
-    legalities: Dict[ScryFormat, ScryLegality]
+    legalities: dict[ScryFormat, ScryLegality]
     life_modifier: Optional[str] = None
     loyalty: Optional[str] = None
     mana_cost: Optional[str] = None
@@ -374,40 +374,40 @@ class ScryCard(
     oversized: bool
     penny_rank: Optional[int] = None
     power: Optional[str] = None
-    produced_mana: Optional[List[str]] = None
+    produced_mana: Optional[list[str]] = None
     reserved: bool
     toughness: Optional[str] = None
     type_line: Optional[str] = None
     # Print Fields
     artist: Optional[str] = None
-    artist_ids: Optional[List[UUID]] = None
+    artist_ids: Optional[list[UUID]] = None
     booster: bool
     border_color: ScryBorderColor
     card_back_id: Optional[UUID] = None
     collector_number: str
     content_warning: Optional[bool] = None
     digital: bool
-    finishes: List[ScryFinish]
+    finishes: list[ScryFinish]
     flavor_name: Optional[str] = None
     flavor_text: Optional[str] = None
     frame_effect: Optional[ScryFrameEffect] = None
-    frame_effects: Optional[List[ScryFrameEffect]] = None
+    frame_effects: Optional[list[ScryFrameEffect]] = None
     frame: ScryCardFrame
     full_art: bool
-    games: List[ScryGame]
+    games: list[ScryGame]
     highres_image: bool
     illustration_id: Optional[UUID] = None
     image_status: ScryImageStatus
-    image_uris: Optional[Dict[str, str]] = None
-    prices: Optional[Dict[str, Optional[Decimal]]]  # TODO: enum keys=None
+    image_uris: Optional[dict[str, str]] = None
+    prices: Optional[dict[str, Optional[Decimal]]]  # TODO: enum keys=None
     printed_name: Optional[str] = None
     printed_text: Optional[str] = None
     printed_type_line: Optional[str] = None
     promo: bool
-    promo_types: Optional[List[str]] = None
-    purchase_uris: Optional[Dict[str, str]] = None
+    promo_types: Optional[list[str]] = None
+    purchase_uris: Optional[dict[str, str]] = None
     rarity: ScryRarity
-    related_uris: Optional[Dict[str, str]] = None
+    related_uris: Optional[dict[str, str]] = None
     released_at: dt.date
     reprint: bool
     scryfall_set_uri: str
@@ -485,8 +485,8 @@ class ScryList(
 ):
     """Model for https://scryfall.com/docs/api/lists."""
 
-    data: List[_ScryListableT]
+    data: list[_ScryListableT]
     has_more: bool
     next_page: Optional[str] = None
     total_cards: Optional[int] = None
-    warnings: Optional[List[str]] = None
+    warnings: Optional[list[str]] = None

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/mtg_ssm/serialization/csv_serializer.py

@@ -2,8 +2,9 @@
 
 import csv
 import datetime as dt
+from collections.abc import Iterable, Mapping
 from pathlib import Path
-from typing import Any, ClassVar, Dict, Iterable, Mapping
+from typing import Any, ClassVar, Optional
 
 from mtg_ssm.containers import counts
 from mtg_ssm.containers.collection import MagicCollection
@@ -15,7 +16,7 @@ from mtg_ssm.serialization import interface
 CSV_HEADER = ["set", "name", "collector_number", "scryfall_id"] + [ct.value for ct in CountType]
 
 
-def row_for_card(card: ScryCard, card_count: Mapping[CountType, int]) -> Dict[str, Any]:
+def row_for_card(card: ScryCard, card_count: Mapping[CountType, int]) -> dict[str, Any]:
     """Given a CardPrinting and counts, return a csv row."""
     return {
         "set": card.set.upper(),
@@ -26,7 +27,7 @@ def row_for_card(card: ScryCard, card_count: Mapping[CountType, int]) -> Dict[st
     }
 
 
-def rows_for_cards(collection: MagicCollection, verbose: bool) -> Iterable[Dict[str, Any]]:
+def rows_for_cards(collection: MagicCollection, verbose: bool) -> Iterable[dict[str, Any]]:
     """Yield csv rows from a collection."""
     for card_set in sorted(
         collection.oracle.index.setcode_to_set.values(),
@@ -41,8 +42,8 @@ def rows_for_cards(collection: MagicCollection, verbose: bool) -> Iterable[Dict[
 class CsvFullDialect(interface.SerializationDialect):
     """csv collection writing a row for every printing."""
 
-    extension: ClassVar[str] = "csv"
-    dialect: ClassVar[str] = "csv"
+    extension: ClassVar[Optional[str]] = "csv"
+    dialect: ClassVar[Optional[str]] = "csv"
 
     verbose: ClassVar[bool] = True
 
@@ -65,6 +66,6 @@ class CsvFullDialect(interface.SerializationDialect):
 class CsvTerseDialect(CsvFullDialect):
     """csv collection writing only rows that have counts."""
 
-    dialect: ClassVar[str] = "terse"
+    dialect: ClassVar[Optional[str]] = "terse"
 
     verbose: ClassVar[bool] = False

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/mtg_ssm/serialization/interface.py

@@ -2,7 +2,7 @@
 
 import abc
 from pathlib import Path
-from typing import ClassVar, Dict, List, Optional, Set, Tuple, Type
+from typing import ClassVar, Optional
 
 from mtg_ssm.containers.collection import MagicCollection
 from mtg_ssm.containers.indexes import Oracle
@@ -23,13 +23,13 @@ class DeserializationError(Error):
 class SerializationDialect(metaclass=abc.ABCMeta):
     """Abstract interface for mtg ssm serialization dialect."""
 
-    _EXT_DIALECT_DOC: ClassVar[Set[Tuple[str, str, str]]] = set()
-    _EXT_DIALECT_TO_IMPL: ClassVar[Dict[Tuple[str, str], Type["SerializationDialect"]]] = {}
+    _EXT_DIALECT_DOC: ClassVar[set[tuple[str, str, str]]] = set()
+    _EXT_DIALECT_TO_IMPL: ClassVar[dict[tuple[str, str], type["SerializationDialect"]]] = {}
 
     extension: ClassVar[Optional[str]] = None
     dialect: ClassVar[Optional[str]] = None
 
-    def __init_subclass__(cls: Type["SerializationDialect"]) -> None:
+    def __init_subclass__(cls: type["SerializationDialect"]) -> None:
         super().__init_subclass__()
         if cls.extension is not None and cls.dialect is not None:
             cls._EXT_DIALECT_DOC.add((cls.extension, cls.dialect, cls.__doc__ or cls.__name__))
@@ -45,17 +45,17 @@ class SerializationDialect(metaclass=abc.ABCMeta):
 
     @classmethod
     def dialects(
-        cls: Type["SerializationDialect"],
-    ) -> List[Tuple[str, Optional[str], Optional[str]]]:
+        cls: type["SerializationDialect"],
+    ) -> list[tuple[str, Optional[str], Optional[str]]]:
         """List of (extension, dialect, description) of registered dialects."""
         return sorted((ext, dial or "", doc or "") for ext, dial, doc in cls._EXT_DIALECT_DOC)
 
     @classmethod
     def by_extension(
-        cls: Type["SerializationDialect"],
+        cls: type["SerializationDialect"],
         extension: str,
-        dialect_mappings: Dict[str, str],
-    ) -> Type["SerializationDialect"]:
+        dialect_mappings: dict[str, str],
+    ) -> type["SerializationDialect"]:
         """Get a serializer class for a given extension and dialect mapping."""
         dialect = dialect_mappings.get(extension, extension)
         try:

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/mtg_ssm/serialization/xlsx_serializer.py

@@ -5,8 +5,9 @@ import datetime as dt
 import importlib.util
 import itertools
 import string
+from collections.abc import Iterable, Sequence
 from pathlib import Path
-from typing import Any, ClassVar, Dict, Iterable, List, Optional, Sequence, Set, Tuple
+from typing import Any, ClassVar, Optional
 
 import openpyxl
 from openpyxl.styles.numbers import FORMAT_CURRENCY_USD_SIMPLE
@@ -43,7 +44,7 @@ ALL_SETS_SHEET_TOTALS: Sequence[Optional[str]] = ["Total", None, None, None, Non
 ]
 
 
-def _card_set_sort_key(cset: ScrySet) -> Tuple[dt.date, str, int, str]:
+def _card_set_sort_key(cset: ScrySet) -> tuple[dt.date, str, int, str]:
     released_at = cset.released_at or dt.date.min
     return (
         released_at,
@@ -123,7 +124,7 @@ def create_haverefs(index: ScryfallDataIndex, setcode: str, cards: Sequence[Scry
 
 
 def get_references(
-    index: ScryfallDataIndex, card_name: str, exclude_sets: Optional[Set[str]] = None
+    index: ScryfallDataIndex, card_name: str, exclude_sets: Optional[set[str]] = None
 ) -> Optional[str]:
     """Get an equation for the references to a card."""
     if util.is_strict_basic(card_name):
@@ -132,7 +133,7 @@ def get_references(
     if exclude_sets is None:
         exclude_sets = set()
 
-    set_to_cards: Dict[str, List[ScryCard]] = collections.defaultdict(list)
+    set_to_cards: dict[str, list[ScryCard]] = collections.defaultdict(list)
     for other_card in index.name_to_cards[card_name]:
         if other_card.set not in exclude_sets:
             set_to_cards[other_card.set].append(other_card)
@@ -238,7 +239,7 @@ def create_set_sheet(sheet: Worksheet, collection: MagicCollection, setcode: str
 
     for card in index.setcode_to_cards[setcode]:
         rownum = ROW_OFFSET + index.id_to_setindex[card.id]
-        row: List[Optional[Any]] = [
+        row: list[Optional[Any]] = [
             HAVE_TMPL.format(rownum=rownum),
             VALUE_TMPL.format(rownum=rownum),
             card.name,
@@ -279,7 +280,7 @@ def style_set_sheet(sheet: Worksheet) -> None:
             cdim.number_format = number_format
 
 
-def rows_from_sheet(sheet: Worksheet) -> Iterable[Dict[str, str]]:
+def rows_from_sheet(sheet: Worksheet) -> Iterable[dict[str, str]]:
     """Read rows from an xlsx worksheet as dicts."""
     header_row, *rows = iter(sheet.rows)
     header = [cell.value for cell in header_row]
@@ -290,8 +291,8 @@ def rows_from_sheet(sheet: Worksheet) -> Iterable[Dict[str, str]]:
 
 
 def rows_for_workbook(
-    book: Workbook, *, skip_sheets: Optional[Set[str]]
-) -> Iterable[Dict[str, str]]:
+    book: Workbook, *, skip_sheets: Optional[set[str]]
+) -> Iterable[dict[str, str]]:
     """Read rows from an xlsx workbook as dicts."""
     if skip_sheets is None:
         skip_sheets = set()

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/mtg_ssm/ssm.py

@@ -4,7 +4,7 @@
 import argparse
 import datetime as dt
 from pathlib import Path
-from typing import Dict, List, Optional, Set
+from typing import Optional
 
 import mtg_ssm
 import mtg_ssm.serialization.interface as ser_interface
@@ -24,7 +24,7 @@ def epilog() -> str:
     return dialect_docs
 
 
-def set_type_list(value: str) -> Set[ScrySetType]:
+def set_type_list(value: str) -> set[ScrySetType]:
     """Argparse type to convert a string to a set of Scryfall Set Types."""
     set_types = set()
     for set_str in value.split(","):
@@ -39,7 +39,7 @@ def set_type_list(value: str) -> Set[ScrySetType]:
     return set_types
 
 
-def card_layout_list(value: str) -> Set[ScryCardLayout]:
+def card_layout_list(value: str) -> set[ScryCardLayout]:
     """Argparse type to convert a string to a set of Scryfall Card Layouts."""
     card_layouts = set()
     for layout_str in value.split(","):
@@ -54,7 +54,7 @@ def card_layout_list(value: str) -> Set[ScryCardLayout]:
     return card_layouts
 
 
-def get_args(args: Optional[List[str]] = None) -> argparse.Namespace:
+def get_args(args: Optional[list[str]] = None) -> argparse.Namespace:
     """Parse and return application arguments."""
     parser = argparse.ArgumentParser(
         formatter_class=argparse.RawDescriptionHelpFormatter,
@@ -179,8 +179,8 @@ def get_args(args: Optional[List[str]] = None) -> argparse.Namespace:
 
 def get_oracle(
     *,
-    exclude_set_types: Set[ScrySetType],
-    exclude_card_layouts: Set[ScryCardLayout],
+    exclude_set_types: set[ScrySetType],
+    exclude_card_layouts: set[ScryCardLayout],
     include_digital: bool,
     include_foreign_only: bool,
     separate_promos: bool,
@@ -199,7 +199,7 @@ def get_oracle(
 
 
 def get_serializer(
-    dialect_mapping: Dict[str, str], path: Path
+    dialect_mapping: dict[str, str], path: Path
 ) -> ser_interface.SerializationDialect:
     """Retrieve a serializer compatible with a given filename."""
     extension = path.suffix.lstrip(".")

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/mtg_ssm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: mtg_ssm
-Version: 2.6.12.dev4
+Version: 2.7.0
 Summary: A tool to manage Magic: the Gathering collection spreadsheets
 Author-email: George Leslie-Waksman <waksman@gmail.com>
 License: MIT
@@ -19,18 +19,18 @@ Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Games/Entertainment
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: appdirs~=1.4
 Requires-Dist: msgspec~=0.15
-Requires-Dist: openpyxl~=3.0
+Requires-Dist: openpyxl~=3.1
 Requires-Dist: requests~=2.27
 Requires-Dist: requests-cache~=0.9.8
 Requires-Dist: typing_extensions~=4.8.0
@@ -240,6 +240,12 @@ Development
 
 -   ...
 
+2.7.0
+-----
+
+-   Drop support for Python 3.8
+-   Add support for Python 3.13
+
 2.6.9
 -----
 

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/mtg_ssm.egg-info/requires.txt

@@ -1,6 +1,6 @@
 appdirs~=1.4
 msgspec~=0.15
-openpyxl~=3.0
+openpyxl~=3.1
 requests~=2.27
 requests-cache~=0.9.8
 typing_extensions~=4.8.0

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/pyproject.toml

@@ -7,7 +7,7 @@ name = "mtg_ssm"
 description = "A tool to manage Magic: the Gathering collection spreadsheets"
 readme = "README.rst"
 authors = [{ name = "George Leslie-Waksman", email = "waksman@gmail.com" }]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 keywords = ["mtg", "magic", "collection", "tracking", "spreadsheet"]
 license = { text = "MIT" }
 classifiers = [
@@ -23,18 +23,18 @@ classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Games/Entertainment",
 ]
 
 dependencies = [
     "appdirs~=1.4",
     "msgspec~=0.15",
-    "openpyxl~=3.0",
+    "openpyxl~=3.1",
     "requests~=2.27",
     "requests-cache~=0.9.8",
     "typing_extensions~=4.8.0",
@@ -93,7 +93,7 @@ addopts = "--cov mtg_ssm --cov-report term-missing"
 testpaths = ["tests"]
 
 [tool.mypy]
-python_version = "3.8"
+python_version = "3.9"
 
 follow_imports = "normal"
 disallow_untyped_defs = true
@@ -101,10 +101,10 @@ allow_untyped_globals = false
 
 [tool.black]
 line-length = 99
-target-version = ["py38"]
+target-version = ["py39"]
 
 [tool.ruff]
-target-version = "py38"
+target-version = "py39"
 line-length = 99
 
 [tool.ruff.lint]

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/tests/conftest.py

@@ -1,8 +1,8 @@
 """pytest test configuration file."""
 
 import time
+from collections.abc import Generator
 from pathlib import Path
-from typing import Dict, Generator, List
 from uuid import UUID
 
 import msgspec
@@ -46,14 +46,14 @@ def requests_mock() -> Generator[responses.RequestsMock, None, None]:
 
 
 @pytest.fixture(scope="session")
-def cards_data() -> List[ScryCard]:
+def cards_data() -> list[ScryCard]:
     """Fixture containing all test card data."""
     with CARDS_DATA_FILE.open("rb") as card_data_file:
-        return msgspec.json.decode(card_data_file.read(), type=List[ScryCard])
+        return msgspec.json.decode(card_data_file.read(), type=list[ScryCard])
 
 
 @pytest.fixture(scope="session")
-def sets_data() -> List[ScrySet]:
+def sets_data() -> list[ScrySet]:
     """Fixture containing all test set data."""
     with SETS_DATA_FILE.open("rb") as sets_data_file:
         sets_list = msgspec.json.decode(sets_data_file.read(), type=ScryList[ScrySet])
@@ -61,7 +61,7 @@ def sets_data() -> List[ScrySet]:
 
 
 @pytest.fixture(scope="session")
-def migrations_data() -> List[ScryMigration]:
+def migrations_data() -> list[ScryMigration]:
     """Fixture containing all test migrations data."""
     with MIGRATIONS_DATA_FILE.open("rb") as migrations_data_file:
         migrations_list = msgspec.json.decode(
@@ -71,16 +71,16 @@ def migrations_data() -> List[ScryMigration]:
 
 
 @pytest.fixture(scope="session")
-def id_to_card(cards_data: List[ScryCard]) -> Dict[UUID, ScryCard]:
+def id_to_card(cards_data: list[ScryCard]) -> dict[UUID, ScryCard]:
     """Fixture returning scryfall id to card object for all test card data."""
     return {card.id: card for card in cards_data}
 
 
 @pytest.fixture(scope="session")
 def scryfall_data(
-    cards_data: List[ScryCard],
-    sets_data: List[ScrySet],
-    migrations_data: List[ScryMigration],
+    cards_data: list[ScryCard],
+    sets_data: list[ScrySet],
+    migrations_data: list[ScryMigration],
 ) -> ScryfallDataSet:
     """Fixture containing all scryfall test data."""
     return ScryfallDataSet(sets=sets_data, cards=cards_data, migrations=migrations_data)

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/tests/containers/test_counts.py

@@ -1,6 +1,6 @@
 """Tests for mtg_ssm.mtg.counts."""
 
-from typing import Any, Dict, List
+from typing import Any
 from uuid import UUID
 
 import pytest
@@ -50,7 +50,7 @@ def oracle(scryfall_data: ScryfallDataSet) -> Oracle:
     ],
 )
 def test_merge_card_counts(
-    in_card_counts: List[ScryfallCardCount], out_card_count: ScryfallCardCount
+    in_card_counts: list[ScryfallCardCount], out_card_count: ScryfallCardCount
 ) -> None:
     assert counts.merge_card_counts(*in_card_counts) == out_card_count
 
@@ -193,6 +193,6 @@ def test_diff_card_counts(
     ],
 )
 def test_aggregate_card_counts(
-    oracle: Oracle, card_rows: List[Dict[str, Any]], output: counts.ScryfallCardCount
+    oracle: Oracle, card_rows: list[dict[str, Any]], output: counts.ScryfallCardCount
 ) -> None:
     assert counts.aggregate_card_counts(card_rows, oracle) == output

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/tests/containers/test_legacy.py

@@ -1,6 +1,6 @@
 """Tests for mtg_ssm.containers.legacy."""
 
-from typing import Any, Dict
+from typing import Any
 from uuid import UUID
 
 import pytest
@@ -30,7 +30,7 @@ def oracle(scryfall_data: ScryfallDataSet) -> Oracle:
         ),
     ],
 )
-def test_extract_counts(card_row: Dict[str, Any], expected: Dict[str, int]) -> None:
+def test_extract_counts(card_row: dict[str, Any], expected: dict[str, int]) -> None:
     assert legacy.extract_counts(card_row) == expected
 
 
@@ -86,7 +86,7 @@ def test_extract_counts(card_row: Dict[str, Any], expected: Dict[str, int]) -> N
         ),
     ],
 )
-def test_find_scryfall_id(card_row: Dict[str, Any], expected: UUID, oracle: Oracle) -> None:
+def test_find_scryfall_id(card_row: dict[str, Any], expected: UUID, oracle: Oracle) -> None:
     assert legacy.find_scryfall_id(card_row, oracle) == expected
 
 
@@ -101,5 +101,5 @@ def test_find_scryfall_id(card_row: Dict[str, Any], expected: UUID, oracle: Orac
         ),
     ],
 )
-def test_coerce_row(card_row: Dict[str, Any], expected: Dict[str, Any], oracle: Oracle) -> None:
+def test_coerce_row(card_row: dict[str, Any], expected: dict[str, Any], oracle: Oracle) -> None:
     assert legacy.coerce_row(card_row, oracle) == expected

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/tests/mtg/test_util.py

@@ -1,6 +1,5 @@
 """Tests for mtg_ssm.mtg.util."""
 
-from typing import Dict, Tuple
 from uuid import UUID
 
 import pytest
@@ -44,10 +43,10 @@ def test_is_strict_basic(name: str, expected: bool) -> None:
     ],
 )
 def test_collector_number_parts(
-    id_to_card: Dict[UUID, ScryCard],
+    id_to_card: dict[UUID, ScryCard],
     name: str,
     card_id: UUID,
-    number_parts: Tuple[str, int, str],
+    number_parts: tuple[str, int, str],
 ) -> None:
     card = id_to_card[card_id]
     assert card.name == name

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/tests/scryfall/test_fetcher.py

@@ -2,7 +2,8 @@
 
 import re
 from pathlib import Path
-from typing import Dict, List, Pattern, Union
+from re import Pattern
+from typing import Union
 
 import pytest
 from responses import RequestsMock
@@ -14,7 +15,7 @@ from tests import gen_testdata
 
 BULK_CARDS_REGEX = r"https://data\.scryfall\.io/default-cards/default-cards-\d{14}\.json"
 
-ENDPOINT_TO_FILE: Dict[Union[str, Pattern[str]], Path] = {
+ENDPOINT_TO_FILE: dict[Union[str, Pattern[str]], Path] = {
     fetcher.BULK_DATA_ENDPOINT: gen_testdata.TARGET_BULK_FILE,
     fetcher.SETS_ENDPOINT: gen_testdata.TARGET_SETS_FILE1,
     gen_testdata.SETS_NEXTPAGE_URL: gen_testdata.TARGET_SETS_FILE2,
@@ -52,9 +53,9 @@ def test_scryfetch() -> None:
 @pytest.mark.usefixtures("_scryurls")
 def test_data_fixtures(
     scryfall_data: ScryfallDataSet,
-    sets_data: List[ScrySet],
-    cards_data: List[ScryCard],
-    migrations_data: List[ScryMigration],
+    sets_data: list[ScrySet],
+    cards_data: list[ScryCard],
+    migrations_data: list[ScryMigration],
 ) -> None:
     scrydata = fetcher.scryfetch()
     assert scrydata == scryfall_data

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/tests/serialization/test_csv_serializer.py

@@ -2,7 +2,6 @@
 
 import textwrap
 from pathlib import Path
-from typing import Dict
 from uuid import UUID
 
 import pytest
@@ -42,7 +41,7 @@ def test_header() -> None:
     ]
 
 
-def test_row_for_card(id_to_card: Dict[UUID, ScryCard]) -> None:
+def test_row_for_card(id_to_card: dict[UUID, ScryCard]) -> None:
     card = id_to_card[TEST_CARD_ID]
     card_counts = {counts.CountType.NONFOIL: 3, counts.CountType.FOIL: 5}
     csv_row = csv_serializer.row_for_card(card, card_counts)

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/tests/serialization/test_interface.py

@@ -1,6 +1,5 @@
 """Tests for mtg_ssm.serialization.interface.py."""
 
-from typing import Dict
 from unittest import mock
 
 import pytest
@@ -40,7 +39,7 @@ def test_all_dialects() -> None:
     ],
 )
 def test_extension_lookup(
-    extension: str, dialect_mapping: Dict[str, str], dialect_name: str
+    extension: str, dialect_mapping: dict[str, str], dialect_name: str
 ) -> None:
     serialization_class = interface.SerializationDialect.by_extension(extension, dialect_mapping)
     assert isinstance(serialization_class, type)

{mtg_ssm-2.6.12.dev4 → mtg_ssm-2.7.0}/tests/serialization/test_xlsx_serializer.py

@@ -1,7 +1,7 @@
 """Tests for mtg_ssm.serialization.xlsx."""
 
 from pathlib import Path
-from typing import Dict, List, Optional, Set, Tuple
+from typing import Optional
 from uuid import UUID
 
 import openpyxl
@@ -74,7 +74,7 @@ def test_create_haverefs(oracle: Oracle) -> None:
     ],
 )
 def test_get_references(
-    oracle: Oracle, name: str, exclude_sets: Optional[Set[str]], expected: str
+    oracle: Oracle, name: str, exclude_sets: Optional[set[str]], expected: str
 ) -> None:
     print_refs = xlsx_serializer.get_references(oracle.index, name, exclude_sets=exclude_sets)
     assert print_refs == expected
@@ -160,9 +160,9 @@ def test_write(snapshot: SnapshotAssertion, oracle: Oracle, tmp_path: Path) -> N
     ],
 )
 def test_rows_from_workbook(
-    sheets_and_rows: List[Tuple[str, List[List[str]]]],
-    skip_sheets: Optional[Set[str]],
-    expected: List[Dict[str, str]],
+    sheets_and_rows: list[tuple[str, list[list[str]]]],
+    skip_sheets: Optional[set[str]],
+    expected: list[dict[str, str]],
 ) -> None:
     workbook = openpyxl.Workbook()
     for sheet, rows in sheets_and_rows: