mtg-ssm 2.6.3.dev1__tar.gz → 2.6.4__tar.gz

{mtg_ssm-2.6.3.dev1 → mtg_ssm-2.6.4}/.github/workflows/integration.yml

@@ -20,7 +20,7 @@ jobs:
           - "[lxml]"
     name: End-to-end tests
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-python@v4
         with:

{mtg_ssm-2.6.3.dev1 → mtg_ssm-2.6.4}/.github/workflows/pre-commit.yml

@@ -11,14 +11,13 @@ jobs:
     runs-on: ubuntu-latest
     name: Run all pre-commit checks
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.8"
+          python-version: "3.12"
           cache: pip
-          cache-dependency-path: |
-            pyproject.toml
+          cache-dependency-path: pyproject.toml
 
       - run: |
           pip install -U pip setuptools wheel

{mtg_ssm-2.6.3.dev1 → mtg_ssm-2.6.4}/.github/workflows/publish.yml

@@ -16,7 +16,7 @@ jobs:
       id-token: write
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # setuptools_scm needs the git history
           fetch-depth: 0

{mtg_ssm-2.6.3.dev1 → mtg_ssm-2.6.4}/.github/workflows/run-tests.yml

@@ -7,6 +7,38 @@ on:
       - trunk
 
 jobs:
+  can-run:
+    strategy:
+      matrix:
+        python-version:
+          - "3.8"
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+        os:
+          - ubuntu-latest
+          - macos-latest
+          - windows-latest
+    runs-on: ${{ matrix.os }}
+    name: Can run on ${{ matrix.os }} - Python ${{ matrix.python-version }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "${{ matrix.python-version }}"
+          cache: pip
+          cache-dependency-path: pyproject.toml
+
+      - name: Install project
+        run: |
+          pip install -U pip setuptools
+          pip install -e .
+
+      - name: Run mtg-ssm
+        run: mtg-ssm --help
+
   pytest:
     runs-on: ubuntu-latest
     strategy:
@@ -16,16 +48,16 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
     name: Python ${{ matrix.python-version }} pytest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-python@v4
         with:
           python-version: "${{ matrix.python-version }}"
           cache: pip
-          cache-dependency-path: |
-            pyproject.toml
+          cache-dependency-path: pyproject.toml
 
       - name: Install project
         run: |
@@ -39,7 +71,7 @@ jobs:
         run: coverage lcov
 
       - name: Coveralls Parallel
-        uses: coverallsapp/github-action@v2.2.1
+        uses: coverallsapp/github-action@v2.2.3
         with:
           github-token: ${{ secrets.github_token }}
           flag-name: python-${{ matrix.python-version }}
@@ -52,7 +84,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Coveralls Finished
-        uses: coverallsapp/github-action@v2.2.1
+        uses: coverallsapp/github-action@v2.2.3
         with:
           github-token: ${{ secrets.github_token }}
           path-to-lcov: coverage.lcov

{mtg_ssm-2.6.3.dev1 → mtg_ssm-2.6.4}/.pre-commit-config.yaml

@@ -8,21 +8,19 @@ repos:
         language: system
         require_serial: true
         types: [python]
-      - id: isort
-        name: Check import order
-        language: system
-        entry: isort
-        types: [python]
-      - id: pylint
-        name: Static analysis from pylint
-        language: system
-        entry: pylint
-        types: [python]
       - id: mypy
         name: Type checking from mypy
         language: system
         entry: mypy
         types: [python]
+      - id: ruff
+        name: ruff
+        description: "Run ruff on files"
+        entry: ruff check --force-exclude
+        language: system
+        types_or: [python, pyi]
+        args: [--fix, --exit-non-zero-on-fix]
+        require_serial: true
       - id: doc8-python
         name: Documentation checking from doc8 (Python)
         language: system

{mtg_ssm-2.6.3.dev1 → mtg_ssm-2.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mtg_ssm
-Version: 2.6.3.dev1
+Version: 2.6.4
 Summary: A tool to manage Magic: the Gathering collection spreadsheets
 Author-email: George Leslie-Waksman <waksman@gmail.com>
 License: MIT
@@ -26,9 +26,36 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Games/Entertainment
 Requires-Python: >=3.8
 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: requests~=2.27
+Requires-Dist: requests-cache~=0.9.8
+Requires-Dist: typing_extensions~=4.8.0
 Provides-Extra: lxml
+Requires-Dist: lxml>=3.7.2; extra == "lxml"
 Provides-Extra: dev
-License-File: LICENSE.txt
+Requires-Dist: black; extra == "dev"
+Requires-Dist: coverage[toml]; extra == "dev"
+Requires-Dist: doc8; extra == "dev"
+Requires-Dist: freezegun; extra == "dev"
+Requires-Dist: lxml; extra == "dev"
+Requires-Dist: mypy; extra == "dev"
+Requires-Dist: openpyxl-stubs; extra == "dev"
+Requires-Dist: pip; extra == "dev"
+Requires-Dist: Pygments; extra == "dev"
+Requires-Dist: pytest>=6.0; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: responses; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
+Requires-Dist: setuptools>=45; extra == "dev"
+Requires-Dist: setuptools-scm[toml]>=6.2; extra == "dev"
+Requires-Dist: syrupy>=4.0; extra == "dev"
+Requires-Dist: types-appdirs; extra == "dev"
+Requires-Dist: types-freezegun; extra == "dev"
+Requires-Dist: types-requests; extra == "dev"
+Requires-Dist: wheel; extra == "dev"
 
 mtg-ssm - Magic: the Gathering Spreadsheet Manager
 ===================================================

{mtg_ssm-2.6.3.dev1 → mtg_ssm-2.6.4}/TODO.md

@@ -8,3 +8,4 @@
 -   Update card_count for sets when processing bundle filters
 -   Can we read images from icon_svg_uri in sets, rasterize, and
     insert the set icons in the xlsx "All Sets" page?
+-   Can we switch to hatchling as our build system?

mtg_ssm-2.6.4/mtg_ssm/_version.py

@@ -0,0 +1,16 @@
+# file generated by setuptools_scm
+# don't change, don't track in version control
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple, Union
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+else:
+    VERSION_TUPLE = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+
+__version__ = version = '2.6.4'
+__version_tuple__ = version_tuple = (2, 6, 4)

{mtg_ssm-2.6.3.dev1 → mtg_ssm-2.6.4}/mtg_ssm/containers/bundles.py

@@ -20,7 +20,7 @@ class ScryfallDataSet(NamedTuple):
     migrations: List[ScryMigration]
 
 
-def filter_cards_and_sets(
+def filter_cards_and_sets(  # noqa: C901
     scryfall_data: ScryfallDataSet,
     *,
     exclude_set_types: Optional[Set[ScrySetType]] = None,
@@ -49,7 +49,8 @@ def filter_cards_and_sets(
 
     accepted_cards = []
     nonempty_setcodes = set()
-    for card in scryfall_data.cards:
+    for card_loop in scryfall_data.cards:
+        card = card_loop  # capture loop variable
         while card.set in remapped_setcodes:
             collector_number = card.collector_number
             if collector_number.isdigit():

{mtg_ssm-2.6.3.dev1 → mtg_ssm-2.6.4}/mtg_ssm/containers/collection.py

@@ -2,6 +2,8 @@
 
 from dataclasses import dataclass
 
+from typing_extensions import Self
+
 from mtg_ssm.containers import counts
 from mtg_ssm.containers.counts import ScryfallCardCount
 from mtg_ssm.containers.indexes import Oracle
@@ -22,7 +24,7 @@ class MagicCollection:
             counts=counts.merge_card_counts(self.counts, other.counts),
         )
 
-    def __iadd__(self, other: "MagicCollection") -> "MagicCollection":
+    def __iadd__(self, other: "MagicCollection") -> Self:
         if not isinstance(other, MagicCollection):
             return NotImplemented
         self.counts = counts.merge_card_counts(self.counts, other.counts)
@@ -36,7 +38,7 @@ class MagicCollection:
             counts=counts.diff_card_counts(self.counts, other.counts),
         )
 
-    def __isub__(self, other: "MagicCollection") -> "MagicCollection":
+    def __isub__(self, other: "MagicCollection") -> Self:
         if not isinstance(other, MagicCollection):
             return NotImplemented
         self.counts = counts.diff_card_counts(self.counts, other.counts)

{mtg_ssm-2.6.3.dev1 → mtg_ssm-2.6.4}/mtg_ssm/containers/counts.py

@@ -33,7 +33,8 @@ def aggregate_card_counts(
 ) -> ScryfallCardCount:
     """Extract card counts from card rows."""
     card_counts: ScryfallCardCount = {}
-    for card_row in card_rows:
+    for card_row_loop in card_rows:
+        card_row = card_row_loop  # capture loop variable
         if "scryfall_id" not in card_row:
             card_row = legacy.coerce_row(card_row, oracle)
         if not card_row:
@@ -50,9 +51,8 @@ def aggregate_card_counts(
             while scryfall_id in oracle.index.migrate_old_id_to_new_id:
                 scryfall_id = oracle.index.migrate_old_id_to_new_id[scryfall_id]
             if scryfall_id not in oracle.index.id_to_card:
-                raise CardNotFoundError(
-                    f"Found counts for card={scryfall_id} not found scryfall data"
-                )
+                msg = f"Found counts for card={scryfall_id} not found scryfall data"
+                raise CardNotFoundError(msg)
             card_counts[scryfall_id] = counts
     return card_counts
 
@@ -66,9 +66,7 @@ def merge_card_counts(*card_counts_args: ScryfallCardCount) -> ScryfallCardCount
     return dict(merged_counts)
 
 
-def diff_card_counts(
-    left: ScryfallCardCount, right: ScryfallCardCount
-) -> ScryfallCardCount:
+def diff_card_counts(left: ScryfallCardCount, right: ScryfallCardCount) -> ScryfallCardCount:
     """Subtract right print counts from left print counts."""
     diffed_counts: ScryfallCardCount = collections.defaultdict(dict)
     for card_id in left.keys() | right.keys():

{mtg_ssm-2.6.3.dev1 → mtg_ssm-2.6.4}/mtg_ssm/containers/indexes.py

@@ -73,9 +73,7 @@ class ScryfallDataIndex:
 
         self.snnma_to_id = collections.defaultdict(set)
 
-        name_to_unsorted_cards: Dict[str, List[ScryCard]] = collections.defaultdict(
-            list
-        )
+        name_to_unsorted_cards: Dict[str, List[ScryCard]] = collections.defaultdict(list)
         setcode_to_unsorted_cards: Dict[str, List[ScryCard]] = {}
 
         for set_ in scrydata.sets:

{mtg_ssm-2.6.3.dev1 → mtg_ssm-2.6.4}/mtg_ssm/containers/legacy.py

@@ -102,20 +102,18 @@ PSUDONYM_TO_ARTIST: Dict[Optional[str], str] = {
 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 = [set_code, set_code.lower()] + OTHER_SET_CODE_TO_SET_CODE.get(
-        set_code, []
-    )
+    set_codes = [
+        set_code,
+        set_code.lower(),
+        *OTHER_SET_CODE_TO_SET_CODE.get(set_code, []),
+    ]
     name = card_row.get("name", "")
     collector_number = card_row.get("number") or None
     mvid = int(card_row.get("multiverseid") or -1)
     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]]
-    ] = []
+    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]]] = []
     for set_ in set_codes:
         snnma_keys += [
             (set_, name, collector_number, None, None),
@@ -141,8 +139,10 @@ def find_scryfall_id(card_row: Dict[str, str], oracle: Oracle) -> UUID:
                 )
                 return scryfall_id
     if seen:
-        raise MultipleMatchError(f"Could not find scryfall card for row: {card_row}")
-    raise NoMatchError(f"Could not find scryfall card for row: {card_row}")
+        msg = f"Could not find scryfall card for row: {card_row}"
+        raise MultipleMatchError(msg)
+    msg = f"Could not find scryfall card for row: {card_row}"
+    raise NoMatchError(msg)
 
 
 def coerce_row(card_row: Dict[str, Any], oracle: Oracle) -> Dict[str, Any]:

{mtg_ssm-2.6.3.dev1 → mtg_ssm-2.6.4}/mtg_ssm/scryfall/fetcher.py

@@ -28,7 +28,7 @@ CACHE_SERIALIZER = SerializerPipeline(
     is_binary=True,
 )
 SESSION = CachedSession(
-    os.path.join(CACHE_DIR, "requests_cache.sqlite"),
+    os.path.join(CACHE_DIR, "requests_cache.sqlite"),  # noqa: PTH118
     backend="sqlite",
     serializer=CACHE_SERIALIZER,
     cache_control=True,
@@ -51,7 +51,7 @@ def _fetch_endpoint(endpoint: str) -> bytes:
     return response.content
 
 
-def scryfetch() -> ScryfallDataSet:  # pylint: disable=too-many-locals
+def scryfetch() -> ScryfallDataSet:
     """Retrieve and deserialize Scryfall object data."""
     print("Reading data from scryfall")
     bulk_data = msgspec.json.decode(
@@ -66,9 +66,7 @@ def scryfetch() -> ScryfallDataSet:  # pylint: disable=too-many-locals
         sets_data += sets_list.data
 
     scrylistmigration_decoder = msgspec.json.Decoder(ScryList[ScryMigration])
-    migrations_list = scrylistmigration_decoder.decode(
-        _fetch_endpoint(MIGRATIONS_ENDPOINT)
-    )
+    migrations_list = scrylistmigration_decoder.decode(_fetch_endpoint(MIGRATIONS_ENDPOINT))
     migrations_data = migrations_list.data
     while migrations_list.has_more and migrations_list.next_page is not None:
         migrations_list = scrylistmigration_decoder.decode(
@@ -77,11 +75,6 @@ def scryfetch() -> ScryfallDataSet:  # pylint: disable=too-many-locals
         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])
 
-    scryfall_data = ScryfallDataSet(
-        sets=sets_data, cards=cards_data, migrations=migrations_data
-    )
-    return scryfall_data
+    return ScryfallDataSet(sets=sets_data, cards=cards_data, migrations=migrations_data)

{mtg_ssm-2.6.3.dev1 → mtg_ssm-2.6.4}/mtg_ssm/scryfall/models.py

@@ -1,9 +1,10 @@
 """Scryfall object models."""
+# ruff: noqa: A003
 
 import datetime as dt
 from decimal import Decimal
 from enum import Enum
-from typing import Dict, Generic, List, Literal, Optional, TypeVar, Union
+from typing import Dict, Generic, List, Optional, TypeVar, Union
 from uuid import UUID
 
 from msgspec import Struct
@@ -11,7 +12,7 @@ from typing_extensions import TypeAlias
 
 
 class ScryColor(str, Enum):
-    """Enum for https://scryfall.com/docs/api/colors#color-arrays"""
+    """Enum for https://scryfall.com/docs/api/colors#color-arrays."""
 
     WHITE = "W"
     BLUE = "U"
@@ -23,7 +24,7 @@ class ScryColor(str, Enum):
 
 
 class ScrySetType(str, Enum):
-    """Enum for https://scryfall.com/docs/api/sets#set-types"""
+    """Enum for https://scryfall.com/docs/api/sets#set-types."""
 
     CORE = "core"
     EXPANSION = "expansion"
@@ -43,7 +44,7 @@ class ScrySetType(str, Enum):
     STARTER = "starter"
     BOX = "box"
     PROMO = "promo"
-    TOKEN = "token"
+    TOKEN = "token"  # noqa: S105
     MEMORABILIA = "memorabilia"
     ALCHEMY = "alchemy"
     ARSENAL = "arsenal"
@@ -51,7 +52,7 @@ class ScrySetType(str, Enum):
 
 
 class ScryCardLayout(str, Enum):
-    """Enum for https://scryfall.com/docs/api/layouts#layout"""
+    """Enum for https://scryfall.com/docs/api/layouts#layout."""
 
     NORMAL = "normal"
     SPLIT = "split"
@@ -66,8 +67,8 @@ class ScryCardLayout(str, Enum):
     PLANAR = "planar"
     SCHEME = "scheme"
     VANGUARD = "vanguard"
-    TOKEN = "token"
-    DOUBLE_FACED_TOKEN = "double_faced_token"
+    TOKEN = "token"  # noqa: S105
+    DOUBLE_FACED_TOKEN = "double_faced_token"  # noqa: S105
     EMBLEM = "emblem"
     AUGMENT = "augment"
     HOST = "host"
@@ -79,7 +80,7 @@ class ScryCardLayout(str, Enum):
 
 
 class ScryCardFrame(str, Enum):
-    """Enum for https://scryfall.com/docs/api/layouts#frames"""
+    """Enum for https://scryfall.com/docs/api/layouts#frames."""
 
     Y1993 = "1993"
     Y1997 = "1997"
@@ -89,7 +90,7 @@ class ScryCardFrame(str, Enum):
 
 
 class ScryFrameEffect(str, Enum):
-    """Enum for https://scryfall.com/docs/api/layouts#frame-effects"""
+    """Enum for https://scryfall.com/docs/api/layouts#frame-effects."""
 
     NONE = ""
     LEGENDARY = "legendary"
@@ -122,10 +123,11 @@ class ScryFrameEffect(str, Enum):
     GILDED = "gilded"
     BORDERLESS = "borderless"
     THICK = "thick"
+    GRAVESTONE = "gravestone"
 
 
 class ScryBorderColor(str, Enum):
-    """Enum for card border_color"""
+    """Enum for card border_color."""
 
     BLACK = "black"
     BORDERLESS = "borderless"
@@ -135,7 +137,7 @@ class ScryBorderColor(str, Enum):
 
 
 class ScryFinish(str, Enum):
-    """Enum for card finishes"""
+    """Enum for card finishes."""
 
     FOIL = "foil"
     NONFOIL = "nonfoil"
@@ -144,7 +146,7 @@ class ScryFinish(str, Enum):
 
 
 class ScryImageStatus(str, Enum):
-    """Enum for card image_status"""
+    """Enum for card image_status."""
 
     MISSING = "missing"
     PLACEHOLDER = "placeholder"
@@ -153,7 +155,7 @@ class ScryImageStatus(str, Enum):
 
 
 class ScryGame(str, Enum):
-    """Enum for card games"""
+    """Enum for card games."""
 
     PAPER = "paper"
     ARENA = "arena"
@@ -163,7 +165,7 @@ class ScryGame(str, Enum):
 
 
 class ScryRarity(str, Enum):
-    """Enum for card rarity"""
+    """Enum for card rarity."""
 
     COMMON = "common"
     UNCOMMON = "uncommon"
@@ -174,7 +176,7 @@ class ScryRarity(str, Enum):
 
 
 class ScrySecurityStamp(str, Enum):
-    """Enum for card security_stamp"""
+    """Enum for card security_stamp."""
 
     OVAL = "oval"
     TRIANGLE = "triangle"
@@ -185,7 +187,7 @@ class ScrySecurityStamp(str, Enum):
 
 
 class ScryFormat(str, Enum):
-    """Enum for card legalities keys"""
+    """Enum for card legalities keys."""
 
     BRAWL = "brawl"
     COMMANDER = "commander"
@@ -212,7 +214,7 @@ class ScryFormat(str, Enum):
 
 
 class ScryLegality(str, Enum):
-    """Enum for card legalities values"""
+    """Enum for card legalities values."""
 
     LEGAL = "legal"
     NOT_LEGAL = "not_legal"
@@ -221,7 +223,7 @@ class ScryLegality(str, Enum):
 
 
 class ScryMigrationStrategy(str, Enum):
-    """Enum for migration strategy values"""
+    """Enum for migration strategy values."""
 
     MERGE = "merge"
     DELETE = "delete"
@@ -234,7 +236,7 @@ class ScrySet(
     kw_only=True,
     omit_defaults=True,
 ):
-    """Model for https://scryfall.com/docs/api/sets"""
+    """Model for https://scryfall.com/docs/api/sets."""
 
     id: UUID
     code: str
@@ -265,7 +267,7 @@ class ScryRelatedCard(
     kw_only=True,
     omit_defaults=True,
 ):
-    """Model for https://scryfall.com/docs/api/cards#related-card-objects"""
+    """Model for https://scryfall.com/docs/api/cards#related-card-objects."""
 
     id: UUID
     component: str
@@ -281,7 +283,7 @@ class ScryCardFace(
     kw_only=True,
     omit_defaults=True,
 ):
-    """Model for https://scryfall.com/docs/api/cards#card-face-objects"""
+    """Model for https://scryfall.com/docs/api/cards#card-face-objects."""
 
     artist: Optional[str] = None
     artist_id: Optional[UUID] = None
@@ -311,7 +313,7 @@ class CardPreviewBlock(Struct):
     """Model for card preview block."""
 
     source: str
-    source_uri: Union[str, Literal[""], str]
+    source_uri: str
     previewed_at: dt.date
 
 
@@ -322,7 +324,7 @@ class ScryCard(
     kw_only=True,
     omit_defaults=True,
 ):
-    """Model for https://scryfall.com/docs/api/cards"""
+    """Model for https://scryfall.com/docs/api/cards."""
 
     # Core Card Fields
     arena_id: Optional[int] = None
@@ -420,7 +422,7 @@ class ScryBulkData(
     kw_only=True,
     omit_defaults=True,
 ):
-    """Model for https://scryfall.com/docs/api/bulk-data"""
+    """Model for https://scryfall.com/docs/api/bulk-data."""
 
     id: UUID
     uri: str
@@ -441,7 +443,7 @@ class ScryMigration(
     kw_only=True,
     omit_defaults=True,
 ):
-    """Model for https://scryfall.com/docs/api/migrations"""
+    """Model for https://scryfall.com/docs/api/migrations."""
 
     id: UUID
     uri: str
@@ -470,7 +472,7 @@ class ScryList(
     kw_only=True,
     omit_defaults=True,
 ):
-    """Model for https://scryfall.com/docs/api/lists"""
+    """Model for https://scryfall.com/docs/api/lists."""
 
     data: List[_ScryListableT]
     has_more: bool

mtg_ssm-2.6.4/mtg_ssm/serialization/__init__.py

@@ -0,0 +1,4 @@
+"""Ensure that all serializers are imported to properly set up interface."""
+from . import csv, interface, xlsx
+
+__all__ = ["csv", "interface", "xlsx"]

{mtg_ssm-2.6.3.dev1 → mtg_ssm-2.6.4}/mtg_ssm/serialization/csv.py

@@ -12,9 +12,7 @@ from mtg_ssm.containers.indexes import Oracle
 from mtg_ssm.scryfall.models import ScryCard
 from mtg_ssm.serialization import interface
 
-CSV_HEADER = ["set", "name", "collector_number", "scryfall_id"] + [
-    ct.value for ct in CountType
-]
+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]:
@@ -28,10 +26,8 @@ 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]]:
-    """Generator that yields csv rows from a collection."""
+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(),
         key=lambda cset: (cset.released_at or dt.date.min, cset.code),
@@ -43,7 +39,7 @@ def rows_for_cards(
 
 
 class CsvFullDialect(interface.SerializationDialect):
-    """csv collection writing a row for every printing"""
+    """csv collection writing a row for every printing."""
 
     extension: ClassVar[str] = "csv"
     dialect: ClassVar[str] = "csv"
@@ -67,7 +63,7 @@ class CsvFullDialect(interface.SerializationDialect):
 
 
 class CsvTerseDialect(CsvFullDialect):
-    """csv collection writing only rows that have counts"""
+    """csv collection writing only rows that have counts."""
 
     dialect: ClassVar[str] = "terse"