mtg-ssm 2.7.0__tar.gz → 2.7.1.dev5__tar.gz

{mtg_ssm-2.7.0 → mtg_ssm-2.7.1.dev5}/.github/dependabot.yml

@@ -5,7 +5,7 @@ updates:
     schedule:
       interval: weekly
 
-  - package-ecosystem: pip
+  - package-ecosystem: uv
     directory: /
     schedule:
       interval: daily

mtg_ssm-2.7.1.dev5/.github/workflows/integration.yml

@@ -0,0 +1,48 @@
+name: integration
+concurrency: integration
+
+on:
+  push:
+    branches:
+      # Run on every push to trunk
+      - trunk
+  schedule:
+    # Run every Saturday at 4:05 AM UTC
+    - cron: "5 4 * * SAT"
+
+jobs:
+  end-to-end:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - name: base
+            sync-args: ""
+          - name: lxml
+            sync-args: "--extra lxml"
+    name: End-to-end tests (${{ matrix.name }})
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: true
+          python-version: "3.14"
+
+      - name: Sync runtime environment
+        run: uv sync --frozen --no-dev ${{ matrix.sync-args }}
+
+      - name: Create csv
+        run: uv run --frozen --no-dev mtg-ssm create collection1.csv
+
+      - name: Update csv
+        run: uv run --frozen --no-dev mtg-ssm update collection1.csv
+
+      - name: Create xlsx
+        run: uv run --frozen --no-dev mtg-ssm create collection2.xlsx
+
+      - name: Update xlsx
+        run: uv run --frozen --no-dev mtg-ssm update collection2.xlsx
+
+      - name: Merge csv and xlsx
+        run: uv run --frozen --no-dev mtg-ssm merge collection3.xlsx collection1.csv collection2.xlsx

mtg_ssm-2.7.1.dev5/.github/workflows/pre-commit.yml

@@ -0,0 +1,23 @@
+name: lint
+
+on:
+  pull_request:
+  push:
+    branches:
+      - trunk
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    name: Run all pre-commit checks
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: true
+          python-version: "3.14"
+
+      - run: uv sync --frozen
+
+      - run: uv run --frozen pre-commit run --all-files

{mtg_ssm-2.7.0 → mtg_ssm-2.7.1.dev5}/.github/workflows/publish.yml

@@ -16,26 +16,18 @@ jobs:
       id-token: write
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           # setuptools_scm needs the git history
           fetch-depth: 0
 
-      - uses: actions/setup-python@v5
+      - uses: astral-sh/setup-uv@v7
         with:
-          python-version: "3.9"
-
-      - name: Install pypa/build
-        run: >-
-          pip install --user
-          build
+          enable-cache: true
+          python-version: "3.14"
 
       - name: Build a binary wheel and a source tarball
-        run: >-
-          python -m build
-          --sdist
-          --wheel
-          --outdir dist/
+        run: uv build --sdist --wheel --out-dir dist
 
       - name: Publish distribution 📦 to Test PyPI
         uses: pypa/gh-action-pypi-publish@release/v1.12

{mtg_ssm-2.7.0 → mtg_ssm-2.7.1.dev5}/.github/workflows/run-tests.yml

@@ -11,11 +11,11 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
           - "3.13"
+          - "3.14"
         os:
           - ubuntu-latest
           - macos-latest
@@ -23,52 +23,46 @@ jobs:
     runs-on: ${{ matrix.os }}
     name: Can run on ${{ matrix.os }} - Python ${{ matrix.python-version }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - uses: actions/setup-python@v5
+      - uses: astral-sh/setup-uv@v7
         with:
+          enable-cache: true
           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: Sync runtime environment
+        run: uv sync --frozen --no-dev
 
       - name: Run mtg-ssm
-        run: mtg-ssm --help
+        run: uv run --frozen --no-dev mtg-ssm --help
 
   pytest:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version:
-          - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
           - "3.13"
+          - "3.14"
     name: Python ${{ matrix.python-version }} pytest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - uses: actions/setup-python@v5
+      - uses: astral-sh/setup-uv@v7
         with:
+          enable-cache: true
           python-version: "${{ matrix.python-version }}"
-          cache: pip
-          cache-dependency-path: pyproject.toml
 
-      - name: Install project
-        run: |
-          pip install -U pip setuptools wheel
-          pip install -e .[lxml,dev]
+      - name: Sync test environment
+        run: uv sync --frozen --extra lxml
 
       - name: Execute pytest
-        run: pytest tests/
+        run: uv run --frozen pytest tests/
 
       - name: Convert coverage
-        run: coverage lcov
+        run: uv run --frozen coverage lcov
 
       - name: Coveralls Parallel
         uses: coverallsapp/github-action@v2.3.6
@@ -87,5 +81,4 @@ jobs:
         uses: coverallsapp/github-action@v2.3.6
         with:
           github-token: ${{ secrets.github_token }}
-          path-to-lcov: coverage.lcov
           parallel-finished: true

{mtg_ssm-2.7.0 → mtg_ssm-2.7.1.dev5}/.pre-commit-config.yaml

@@ -4,19 +4,19 @@ repos:
       - id: black
         name: black
         description: "Black: The uncompromising Python code formatter"
-        entry: black
+        entry: uv run --frozen black
         language: system
         require_serial: true
         types: [python]
       - id: mypy
         name: Type checking from mypy
         language: system
-        entry: mypy
+        entry: uv run --frozen mypy
         types: [python]
       - id: ruff
         name: ruff
         description: "Run ruff on files"
-        entry: ruff check --force-exclude
+        entry: uv run --frozen ruff check --force-exclude
         language: system
         types_or: [python, pyi]
         args: [--fix, --exit-non-zero-on-fix]
@@ -24,12 +24,12 @@ repos:
       - id: doc8-python
         name: Documentation checking from doc8 (Python)
         language: system
-        entry: doc8
+        entry: uv run --frozen doc8
         types: [python]
       - id: doc8-rst
         name: Documentation checking from doc8 (reStructuredText)
         language: system
-        entry: doc8
+        entry: uv run --frozen doc8
         types: [rst]
       - id: eclint
         name: EditorConfig file validation

{mtg_ssm-2.7.0 → mtg_ssm-2.7.1.dev5}/PKG-INFO

@@ -1,16 +1,15 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: mtg_ssm
-Version: 2.7.0
+Version: 2.7.1.dev5
 Summary: A tool to manage Magic: the Gathering collection spreadsheets
 Author-email: George Leslie-Waksman <waksman@gmail.com>
-License: MIT
+License-Expression: MIT
 Project-URL: Homepage, https://github.com/gwax/mtg_ssm
 Project-URL: Bug Tracker, https://github.com/gwax/mtg_ssm/issues
 Keywords: mtg,magic,collection,tracking,spreadsheet
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: End Users/Desktop
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: OS Independent
@@ -19,45 +18,24 @@ Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-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: Programming Language :: Python :: 3.14
 Classifier: Topic :: Games/Entertainment
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
-Requires-Dist: appdirs~=1.4
 Requires-Dist: msgspec~=0.15
 Requires-Dist: openpyxl~=3.1
+Requires-Dist: platformdirs~=4.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
-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"
-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"
+Dynamic: license-file
 
 mtg-ssm - Magic: the Gathering Spreadsheet Manager
 ===================================================
@@ -102,19 +80,28 @@ Please also check out my other major Magic: the Gathering project,
 Installation
 ============
 
-mtg-ssm is available on PyPI so, if you have python (>=3.6) and pip
-installed on your system, you should be able to get mtg-ssm by entering
-the following into a terminal:
+mtg-ssm is available on PyPI so, if you have Python (>=3.10) and a
+package installer such as uv or pip installed on your system, you
+should be able to get mtg-ssm by entering one of the following into a
+terminal:
 
 .. code:: bash
 
-    pip3 install mtg_ssm
+    uv tool install mtg_ssm
+
+.. code:: bash
+
+    pip install mtg_ssm
 
 Updates can be performed by entering:
 
 .. code:: bash
 
-    pip3 install -U mtg_ssm
+    uv tool upgrade mtg-ssm
+
+.. code:: bash
+
+    pip install -U mtg_ssm
 
 You can verify installation from the terminal by running:
 
@@ -210,8 +197,26 @@ Contributions
 
 Pull requests are welcome and contributions are greatly appreciated. If you
 would like to contribute, please be sure that all tests and lint checks
-pass. Also consider running `python -m tests.gen_testdata` to ensure that
-everything is up to date and works.
+pass.
+
+Development uses `uv`. A typical local setup is:
+
+.. code:: bash
+
+    uv python install 3.14
+    uv sync --python 3.14 --extra lxml
+
+Common development commands:
+
+.. code:: bash
+
+    uv run --python 3.14 pre-commit run --all-files
+    uv run --python 3.14 pytest
+    uv run --python 3.14 python -m tests.gen_testdata
+
+The package metadata and lint/type-check targets stay on Python 3.10, so
+changes should remain compatible with that floor even when developed from
+a Python 3.14 environment.
 
 Issues can be reported via GitHub.
 
@@ -238,7 +243,9 @@ Changelog
 Development
 -----------
 
--   ...
+-   Switch project development and CI workflows to uv.
+-   Set Python 3.10 as the supported package floor.
+-   Use Python 3.14 for development workflows.
 
 2.7.0
 -----

{mtg_ssm-2.7.0 → mtg_ssm-2.7.1.dev5}/README.rst

@@ -41,19 +41,28 @@ Please also check out my other major Magic: the Gathering project,
 Installation
 ============
 
-mtg-ssm is available on PyPI so, if you have python (>=3.6) and pip
-installed on your system, you should be able to get mtg-ssm by entering
-the following into a terminal:
+mtg-ssm is available on PyPI so, if you have Python (>=3.10) and a
+package installer such as uv or pip installed on your system, you
+should be able to get mtg-ssm by entering one of the following into a
+terminal:
 
 .. code:: bash
 
-    pip3 install mtg_ssm
+    uv tool install mtg_ssm
+
+.. code:: bash
+
+    pip install mtg_ssm
 
 Updates can be performed by entering:
 
 .. code:: bash
 
-    pip3 install -U mtg_ssm
+    uv tool upgrade mtg-ssm
+
+.. code:: bash
+
+    pip install -U mtg_ssm
 
 You can verify installation from the terminal by running:
 
@@ -149,8 +158,26 @@ Contributions
 
 Pull requests are welcome and contributions are greatly appreciated. If you
 would like to contribute, please be sure that all tests and lint checks
-pass. Also consider running `python -m tests.gen_testdata` to ensure that
-everything is up to date and works.
+pass.
+
+Development uses `uv`. A typical local setup is:
+
+.. code:: bash
+
+    uv python install 3.14
+    uv sync --python 3.14 --extra lxml
+
+Common development commands:
+
+.. code:: bash
+
+    uv run --python 3.14 pre-commit run --all-files
+    uv run --python 3.14 pytest
+    uv run --python 3.14 python -m tests.gen_testdata
+
+The package metadata and lint/type-check targets stay on Python 3.10, so
+changes should remain compatible with that floor even when developed from
+a Python 3.14 environment.
 
 Issues can be reported via GitHub.
 
@@ -177,7 +204,9 @@ Changelog
 Development
 -----------
 
--   ...
+-   Switch project development and CI workflows to uv.
+-   Set Python 3.10 as the supported package floor.
+-   Use Python 3.14 for development workflows.
 
 2.7.0
 -----

{mtg_ssm-2.7.0 → mtg_ssm-2.7.1.dev5}/TODO.md

@@ -4,5 +4,3 @@
 -   Group sets by parent set is xlsx output?
     -   Block? probably not
 -   diffs to stdout
--   Update card_count for sets when processing bundle filters
--   Switch to hatchling as our build system?

mtg_ssm-2.7.1.dev5/mtg_ssm/_version.py

@@ -0,0 +1,34 @@
+# file generated by setuptools-scm
+# don't change, don't track in version control
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple
+    from typing import Union
+
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
+else:
+    VERSION_TUPLE = object
+    COMMIT_ID = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
+
+__version__ = version = '2.7.1.dev5'
+__version_tuple__ = version_tuple = (2, 7, 1, 'dev5')
+
+__commit_id__ = commit_id = 'g6ae45693f'

{mtg_ssm-2.7.0 → mtg_ssm-2.7.1.dev5}/mtg_ssm/containers/bundles.py

@@ -1,7 +1,8 @@
 """Data bundle definitions."""
 
 import copy
-from typing import NamedTuple, Optional
+from collections import Counter
+from typing import NamedTuple
 
 from mtg_ssm.scryfall.models import ScryCard, ScryCardLayout, ScryMigration, ScrySet, ScrySetType
 
@@ -14,11 +15,26 @@ class ScryfallDataSet(NamedTuple):
     migrations: list[ScryMigration]
 
 
+def recount_sets(sets: list[ScrySet], cards: list[ScryCard]) -> list[ScrySet]:
+    """Return sets with card counts updated to match the provided card list."""
+    set_code_to_count = Counter(card.set for card in cards)
+    recounted_sets = []
+    for set_ in sets:
+        card_count = set_code_to_count[set_.code]
+        if set_.card_count == card_count:
+            recounted_sets.append(set_)
+            continue
+        recounted_set = copy.copy(set_)
+        recounted_set.card_count = card_count
+        recounted_sets.append(recounted_set)
+    return recounted_sets
+
+
 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: set[ScrySetType] | None = None,
+    exclude_card_layouts: set[ScryCardLayout] | None = None,
     exclude_digital: bool = False,
     exclude_foreing_only: bool = False,
     merge_promos: bool = False,
@@ -68,6 +84,7 @@ def filter_cards_and_sets(  # noqa: C901
         for s in scryfall_data.sets
         if s.code in accepted_setcodes and s.code in nonempty_setcodes
     ]
+    accepted_sets = recount_sets(accepted_sets, accepted_cards)
 
     return ScryfallDataSet(
         sets=accepted_sets,

{mtg_ssm-2.7.0 → mtg_ssm-2.7.1.dev5}/mtg_ssm/containers/indexes.py

@@ -3,7 +3,6 @@
 import collections
 import string
 from collections.abc import Iterable
-from typing import Optional
 from uuid import UUID
 
 from mtg_ssm.containers.bundles import ScryfallDataSet
@@ -23,9 +22,9 @@ def set_card_sort_key(card: ScryCard) -> tuple[str, int, str]:
 
 def build_snnmas(
     card: ScryCard,
-) -> Iterable[tuple[Optional[str], str, Optional[str], Optional[int], Optional[str]]]:
+) -> Iterable[tuple[str | None, str, str | None, int | None, str | None]]:
     """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, str | None]] = {(card.name, card.collector_number)}
     for i, card_face in enumerate(card.card_faces or ()):
         names_cnums |= {
             (card_face.name, card.collector_number),
@@ -33,11 +32,11 @@ def build_snnmas(
         }
     names_cnums |= {(n, None) for n, _ in names_cnums}
 
-    sets: set[Optional[str]] = {card.set, None}
+    sets: set[str | None] = {card.set, None}
 
-    mvids: set[Optional[int]] = {None} | set(card.multiverse_ids or ())
+    mvids: set[int | None] = {None} | set(card.multiverse_ids or ())
 
-    artists: set[Optional[str]] = {card.artist, None}
+    artists: set[str | None] = {card.artist, None}
 
     for name, number in names_cnums:
         for set_ in sets:
@@ -60,7 +59,7 @@ class ScryfallDataIndex:
         # 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]],
+            tuple[str | None, str, str | None, int | None, str | None],
             set[UUID],
         ] = {}
 

{mtg_ssm-2.7.0 → mtg_ssm-2.7.1.dev5}/mtg_ssm/containers/legacy.py

@@ -1,6 +1,6 @@
 """Legacy record lookup capabilities for older file versions."""
 
-from typing import Any, Optional
+from typing import Any
 from uuid import UUID
 
 from mtg_ssm.containers.indexes import Oracle
@@ -93,7 +93,7 @@ OTHER_SET_CODE_TO_SET_CODE = {
     "PCA": ["opca"],
 }
 
-PSUDONYM_TO_ARTIST: dict[Optional[str], str] = {
+PSUDONYM_TO_ARTIST: dict[str | None, str] = {
     "William Murai": "Willian Murai",
     "Dave Seeley": "David Seeley",
 }
@@ -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[str | None, str, str | None, int | None, str | None]] = []
     for set_ in set_codes:
         snnma_keys += [
             (set_, name, collector_number, None, None),

{mtg_ssm-2.7.0 → mtg_ssm-2.7.1.dev5}/mtg_ssm/scryfall/fetcher.py

@@ -1,10 +1,10 @@
 """Scryfall data fetcher."""
 
 import gzip
-import os
+from pathlib import Path
 
-import appdirs
 import msgspec
+from platformdirs import user_cache_dir
 from requests_cache import CachedSession, SerializerPipeline, Stage, pickle_serializer
 
 from mtg_ssm.containers.bundles import ScryfallDataSet
@@ -12,7 +12,7 @@ from mtg_ssm.scryfall.models import ScryBulkData, ScryCard, ScryList, ScryMigrat
 
 APP_AUTHOR = "gwax"
 APP_NAME = "mtg_ssm"
-CACHE_DIR = appdirs.user_cache_dir(APP_NAME, APP_AUTHOR)
+CACHE_DIR = Path(user_cache_dir(APP_NAME, APP_AUTHOR))
 CACHE_SERIALIZER = SerializerPipeline(
     [
         pickle_serializer,
@@ -21,7 +21,7 @@ CACHE_SERIALIZER = SerializerPipeline(
     is_binary=True,
 )
 SESSION = CachedSession(
-    os.path.join(CACHE_DIR, "requests_cache.sqlite"),  # noqa: PTH118
+    str(CACHE_DIR / "requests_cache.sqlite"),
     backend="sqlite",
     serializer=CACHE_SERIALIZER,
     cache_control=True,