mtg-ssm 2.6.7.dev2__tar.gz → 2.6.8__tar.gz

{mtg_ssm-2.6.7.dev2 → mtg_ssm-2.6.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mtg_ssm
-Version: 2.6.7.dev2
+Version: 2.6.8
 Summary: A tool to manage Magic: the Gathering collection spreadsheets
 Author-email: George Leslie-Waksman <waksman@gmail.com>
 License: MIT
@@ -40,6 +40,7 @@ Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: coverage[toml]; extra == "dev"
 Requires-Dist: doc8; extra == "dev"
+Requires-Dist: exceptiongroup; extra == "dev"
 Requires-Dist: freezegun; extra == "dev"
 Requires-Dist: lxml; extra == "dev"
 Requires-Dist: mypy; extra == "dev"

{mtg_ssm-2.6.7.dev2 → mtg_ssm-2.6.8}/mtg_ssm/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.6.7.dev2'
-__version_tuple__ = version_tuple = (2, 6, 7, 'dev2')
+__version__ = version = '2.6.8'
+__version_tuple__ = version_tuple = (2, 6, 8)

{mtg_ssm-2.6.7.dev2 → mtg_ssm-2.6.8}/mtg_ssm/containers/indexes.py

@@ -103,9 +103,9 @@ class ScryfallDataIndex:
                 migration.migration_strategy == ScryMigrationStrategy.MERGE
                 and migration.new_scryfall_id
             ):
-                self.migrate_old_id_to_new_id[
-                    migration.old_scryfall_id
-                ] = migration.new_scryfall_id
+                self.migrate_old_id_to_new_id[migration.old_scryfall_id] = (
+                    migration.new_scryfall_id
+                )
 
 
 class Oracle:

{mtg_ssm-2.6.7.dev2 → mtg_ssm-2.6.8}/mtg_ssm/scryfall/models.py

@@ -1,4 +1,5 @@
 """Scryfall object models."""
+
 # ruff: noqa: A003
 
 import datetime as dt
@@ -54,29 +55,30 @@ class ScrySetType(str, Enum):
 class ScryCardLayout(str, Enum):
     """Enum for https://scryfall.com/docs/api/layouts#layout."""
 
-    NORMAL = "normal"
-    SPLIT = "split"
-    FLIP = "flip"
-    TRANSFORM = "transform"
-    MODAL_DFC = "modal_dfc"
-    MELD = "meld"
-    LEVELER = "leveler"
-    CLASS = "class"
-    SAGA = "saga"
     ADVENTURE = "adventure"
-    PLANAR = "planar"
-    SCHEME = "scheme"
-    VANGUARD = "vanguard"
-    TOKEN = "token"  # noqa: S105
+    ART_SERIES = "art_series"
+    AUGMENT = "augment"
+    CASE = "case"
+    CLASS = "class"
     DOUBLE_FACED_TOKEN = "double_faced_token"  # noqa: S105
+    DOUBLE_SIDED = "double_sided"
     EMBLEM = "emblem"
-    AUGMENT = "augment"
+    FLIP = "flip"
     HOST = "host"
-    ART_SERIES = "art_series"
-    DOUBLE_SIDED = "double_sided"
-    REVERSIBLE_CARD = "reversible_card"
+    LEVELER = "leveler"
+    MELD = "meld"
+    MODAL_DFC = "modal_dfc"
     MUTATE = "mutate"
+    NORMAL = "normal"
+    PLANAR = "planar"
     PROTOTYPE = "prototype"
+    REVERSIBLE_CARD = "reversible_card"
+    SAGA = "saga"
+    SCHEME = "scheme"
+    SPLIT = "split"
+    TOKEN = "token"  # noqa: S105
+    TRANSFORM = "transform"
+    VANGUARD = "vanguard"
 
 
 class ScryCardFrame(str, Enum):
@@ -93,38 +95,42 @@ class ScryFrameEffect(str, Enum):
     """Enum for https://scryfall.com/docs/api/layouts#frame-effects."""
 
     NONE = ""
+
+    BORDERLESS = "borderless"
+    COLORSHIFTED = "colorshifted"
+    COMPANION = "companion"
+    COMPASSLANDDFC = "compasslanddfc"
+    CONVERTDFC = "convertdfc"
+    DEVOID = "devoid"
+    DRAFT = "draft"
+    ETCHED = "etched"
+    EXTENDEDART = "extendedart"
+    FANDFC = "fandfc"
+    FULLART = "fullart"
+    GILDED = "gilded"
+    GRAVESTONE = "gravestone"
+    INVERTED = "inverted"
     LEGENDARY = "legendary"
+    LESSON = "lesson"
     MIRACLE = "miracle"
+    MOONELDRAZIDFC = "mooneldrazidfc"
+    MOONREVERSEMOONDFC = "moonreversemoondfc"
     NYXBORN = "nyxborn"
     NYXTOUCHED = "nyxtouched"
-    DRAFT = "draft"
-    DEVOID = "devoid"
-    TOMBSTONE = "tombstone"
-    COLORSHIFTED = "colorshifted"
-    INVERTED = "inverted"
-    SUNMOONDFC = "sunmoondfc"
-    COMPASSLANDDFC = "compasslanddfc"
     ORIGINPWDFC = "originpwdfc"
-    MOONELDRAZIDFC = "mooneldrazidfc"
-    MOONREVERSEMOONDFC = "moonreversemoondfc"
-    WAXINGANDWANINGMOONDFC = "waxingandwaningmoondfc"
+    PROMO = "promo"
+    SHATTEREDGLASS = "shatteredglass"
     SHOWCASE = "showcase"
-    EXTENDEDART = "extendedart"
-    COMPANION = "companion"
-    FULLART = "fullart"
-    ETCHED = "etched"
     SNOW = "snow"
-    LESSON = "lesson"
+    SPREE = "spree"
+    STAMPED = "stamped"
+    SUNMOONDFC = "sunmoondfc"
     TEXTLESS = "textless"
-    SHATTEREDGLASS = "shatteredglass"
-    CONVERTDFC = "convertdfc"
-    FANDFC = "fandfc"
-    UPSIDEDOWNDFC = "upsidedowndfc"
-    GILDED = "gilded"
-    BORDERLESS = "borderless"
     THICK = "thick"
-    GRAVESTONE = "gravestone"
+    TOMBSTONE = "tombstone"
+    UPSIDEDOWNDFC = "upsidedowndfc"
     VEHICLE = "vehicle"
+    WAXINGANDWANINGMOONDFC = "waxingandwaningmoondfc"
 
 
 class ScryBorderColor(str, Enum):
@@ -190,28 +196,30 @@ class ScrySecurityStamp(str, Enum):
 class ScryFormat(str, Enum):
     """Enum for card legalities keys."""
 
+    ALCHEMY = "alchemy"
     BRAWL = "brawl"
     COMMANDER = "commander"
     DUEL = "duel"
+    EXPLORER = "explorer"
     FRONTIER = "frontier"
     FUTURE = "future"
+    GLADIATOR = "gladiator"
+    HISTORIC = "historic"
+    HISTORICBRAWL = "historicbrawl"
     LEGACY = "legacy"
     MODERN = "modern"
+    OATHBREAKER = "oathbreaker"
     OLDSCHOOL = "oldschool"
     PAUPER = "pauper"
+    PAUPERCOMMANDER = "paupercommander"
     PENNY = "penny"
-    STANDARD = "standard"
-    VINTAGE = "vintage"
-    HISTORIC = "historic"
     PIONEER = "pioneer"
-    GLADIATOR = "gladiator"
-    EXPLORER = "explorer"
-    HISTORICBRAWL = "historicbrawl"
-    ALCHEMY = "alchemy"
-    PAUPERCOMMANDER = "paupercommander"
-    PREMODERN = "premodern"
     PREDH = "predh"
-    OATHBREAKER = "oathbreaker"
+    PREMODERN = "premodern"
+    STANDARD = "standard"
+    STANDARDBRAWL = "standardbrawl"
+    TIMELESS = "timeless"
+    VINTAGE = "vintage"
 
 
 class ScryLegality(str, Enum):

{mtg_ssm-2.6.7.dev2 → mtg_ssm-2.6.8}/mtg_ssm/serialization/__init__.py

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

{mtg_ssm-2.6.7.dev2 → mtg_ssm-2.6.8}/mtg_ssm/serialization/xlsx.py

@@ -137,8 +137,8 @@ def get_references(
         set_to_haveref,
         key=lambda setcode: _card_set_sort_key(index.setcode_to_set[setcode]),
     ):
-        reference = 'IF({count}>0,"{setcode}:"&{count},"")'.format(
-            setcode=card_set.upper(), count=set_to_haveref[card_set]
+        reference = (
+            f'IF({set_to_haveref[card_set]}>0,"{card_set.upper()}:"&{set_to_haveref[card_set]},"")'
         )
         references.append(reference)
     if not references:

{mtg_ssm-2.6.7.dev2 → mtg_ssm-2.6.8}/mtg_ssm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mtg_ssm
-Version: 2.6.7.dev2
+Version: 2.6.8
 Summary: A tool to manage Magic: the Gathering collection spreadsheets
 Author-email: George Leslie-Waksman <waksman@gmail.com>
 License: MIT
@@ -40,6 +40,7 @@ Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: coverage[toml]; extra == "dev"
 Requires-Dist: doc8; extra == "dev"
+Requires-Dist: exceptiongroup; extra == "dev"
 Requires-Dist: freezegun; extra == "dev"
 Requires-Dist: lxml; extra == "dev"
 Requires-Dist: mypy; extra == "dev"

{mtg_ssm-2.6.7.dev2 → mtg_ssm-2.6.8}/mtg_ssm.egg-info/requires.txt

@@ -9,6 +9,7 @@ typing_extensions~=4.8.0
 black
 coverage[toml]
 doc8
+exceptiongroup
 freezegun
 lxml
 mypy

{mtg_ssm-2.6.7.dev2 → mtg_ssm-2.6.8}/pyproject.toml

@@ -54,6 +54,7 @@ dev = [
     "black",
     "coverage[toml]",
     "doc8",
+    "exceptiongroup",
     "freezegun",
     "lxml",
     "mypy",
@@ -105,6 +106,8 @@ target-version = ["py38"]
 [tool.ruff]
 target-version = "py38"
 line-length = 99
+
+[tool.ruff.lint]
 select = [
     "F",
     "E",
@@ -152,7 +155,7 @@ ignore = [
     "T201", # `print` found; ignoring for now because I don't want to set up logging
 ]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "__init__.py" = [
     "D104", # missing docstring in public package
 ]
@@ -164,9 +167,9 @@ ignore = [
     "S101", # tests should use assert
 ]
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 known-first-party = ["mtg_ssm"]
 
-[tool.ruff.pylint]
+[tool.ruff.lint.pylint]
 max-args = 7
 max-returns = 8

{mtg_ssm-2.6.7.dev2 → mtg_ssm-2.6.8}/tests/conftest.py

@@ -1,5 +1,6 @@
 """pytest test configuration file."""
 
+import time
 from pathlib import Path
 from typing import Dict, Generator, List
 from uuid import UUID
@@ -18,6 +19,18 @@ CARDS_DATA_FILE = TEST_DATA_DIR / "cards.json"
 MIGRATIONS_DATA_FILE = TEST_DATA_DIR / "migrations.json"
 
 
+@pytest.fixture(autouse=True)
+def _set_timezone(monkeypatch: pytest.MonkeyPatch) -> Generator[None, None, None]:
+    """Set timezone to UTC for testing."""
+    try:
+        with monkeypatch.context() as m:
+            m.setenv("TZ", "UTC")
+            time.tzset()
+            yield
+    finally:
+        time.tzset()
+
+
 @pytest.fixture(autouse=True)
 def _fetcher_disable_cache() -> Generator[None, None, None]:
     """Patch fetcher cache dirs for testing."""

{mtg_ssm-2.6.7.dev2 → mtg_ssm-2.6.8}/tests/data/bulk_data.json

@@ -8,8 +8,8 @@
       "type": "default_cards",
       "name": "Default Cards",
       "description": "A JSON file containing every card object on Scryfall in English or the printed language if the card is only available in one language.",
-      "download_uri": "https://data.scryfall.io/default-cards/default-cards-20230906210610.json",
-      "updated_at": "2023-09-06T21:06:10.414000Z",
+      "download_uri": "https://data.scryfall.io/default-cards/default-cards-20240510210636.json",
+      "updated_at": "2024-05-10T21:06:36.150000Z",
       "content_type": "application/json",
       "content_encoding": "gzip"
     }