mtg-ssm 2.5.2.dev2__tar.gz → 2.5.3.dev1__tar.gz

mtg_ssm-2.5.3.dev1/.github/workflows/integration.yml

@@ -0,0 +1,50 @@
+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:
+        extras:
+          - ""
+          - "[lxml]"
+    name: End-to-end tests
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.8"
+          cache: pip
+          cache-dependency-path: |
+            pyproject.toml
+
+      - name: Install project
+        run: |
+          pip install -U pip setuptools wheel
+          pip install -e .${{ matrix.extras }}
+
+      - name: Create csv
+        run: mtg-ssm create collection1.csv
+
+      - name: Update csv
+        run: mtg-ssm update collection1.csv
+
+      - name: Create xlsx
+        run: mtg-ssm create collection2.xlsx
+
+      - name: Update xlsx
+        run: mtg-ssm update collection2.xlsx
+
+      - name: Merge csv and xlsx
+        run: mtg-ssm merge collection3.xlsx collection1.csv collection2.xlsx

{mtg_ssm-2.5.2.dev2 → mtg_ssm-2.5.3.dev1}/.github/workflows/pre-commit.yml

@@ -20,6 +20,8 @@ jobs:
           cache-dependency-path: |
             pyproject.toml
 
-      - run: pip install -e .[lxml,dev]
+      - run: |
+          pip install -U pip setuptools wheel
+          pip install -e .[lxml,dev]
 
       - uses: pre-commit/action@v3.0.0

{mtg_ssm-2.5.2.dev2 → mtg_ssm-2.5.3.dev1}/.github/workflows/run-tests.yml

@@ -28,7 +28,9 @@ jobs:
             pyproject.toml
 
       - name: Install project
-        run: pip install -e .[lmxl,dev]
+        run: |
+          pip install -U pip setuptools wheel
+          pip install -e .[lxml,dev]
 
       - name: Execute pytest
         run: pytest tests/
@@ -37,7 +39,7 @@ jobs:
         run: coverage lcov
 
       - name: Coveralls Parallel
-        uses: coverallsapp/github-action@1.1.3
+        uses: coverallsapp/github-action@v1.2.0
         with:
           github-token: ${{ secrets.github_token }}
           flag-name: python-${{ matrix.python-version }}
@@ -50,7 +52,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Coveralls Finished
-        uses: coverallsapp/github-action@1.1.3
+        uses: coverallsapp/github-action@v1.2.0
         with:
           github-token: ${{ secrets.github_token }}
           path-to-lcov: coverage.lcov

{mtg_ssm-2.5.2.dev2 → mtg_ssm-2.5.3.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mtg_ssm
-Version: 2.5.2.dev2
+Version: 2.5.3.dev1
 Summary: A tool to manage Magic: the Gathering collection spreadsheets
 Author-email: George Leslie-Waksman <waksman@gmail.com>
 License: MIT
@@ -200,6 +200,11 @@ Development
 
 -   ...
 
+2.5.2
+-----
+
+-   Add prEDH legality to models.
+
 2.5.1
 -----
 

{mtg_ssm-2.5.2.dev2 → mtg_ssm-2.5.3.dev1}/README.rst

@@ -168,6 +168,11 @@ Development
 
 -   ...
 
+2.5.2
+-----
+
+-   Add prEDH legality to models.
+
 2.5.1
 -----
 

mtg_ssm-2.5.3.dev1/mtg_ssm/_version.py

@@ -0,0 +1,4 @@
+# file generated by setuptools_scm
+# don't change, don't track in version control
+__version__ = version = '2.5.3.dev1'
+__version_tuple__ = version_tuple = (2, 5, 3, 'dev1')

{mtg_ssm-2.5.2.dev2 → mtg_ssm-2.5.3.dev1}/mtg_ssm/scryfall/fetcher.py

@@ -52,7 +52,7 @@ def _value_from_validation_error(data: JSON, verr: ValidationError) -> Dict[str,
         loc = error["loc"]
         value = data
         for field in loc:
-            if field == "__root__":
+            if field in {"__root__", "__key__"}:
                 break
             if isinstance(value, Mapping) and isinstance(field, str):
                 value = value[field]
@@ -100,10 +100,11 @@ def _deserialize_cards(card_jsons: List[JSON]) -> List[ScryCard]:
             try:
                 cards_data.append(ScryCard.parse_obj(card_json))
             except ValidationError as err:
-                print("Failed with pydantic errors on values:")
-                pprint.pp(_value_from_validation_error(card_json, err))
+                print("Failed with pydantic errors")
                 print("Failed on:")
                 pprint.pp(card_json)
+                print("Failed on values:")
+                pprint.pp(_value_from_validation_error(card_json, err))
                 raise
             except Exception:
                 print("Failed on:")

{mtg_ssm-2.5.2.dev2 → mtg_ssm-2.5.3.dev1}/mtg_ssm/scryfall/models.py

@@ -202,6 +202,7 @@ class ScryFormat(str, Enum):
     ALCHEMY = "alchemy"
     PAUPERCOMMANDER = "paupercommander"
     PREMODERN = "premodern"
+    PREDH = "predh"
 
 
 class ScryLegality(str, Enum):

{mtg_ssm-2.5.2.dev2 → mtg_ssm-2.5.3.dev1}/mtg_ssm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mtg-ssm
-Version: 2.5.2.dev2
+Version: 2.5.3.dev1
 Summary: A tool to manage Magic: the Gathering collection spreadsheets
 Author-email: George Leslie-Waksman <waksman@gmail.com>
 License: MIT
@@ -200,6 +200,11 @@ Development
 
 -   ...
 
+2.5.2
+-----
+
+-   Add prEDH legality to models.
+
 2.5.1
 -----
 

{mtg_ssm-2.5.2.dev2 → mtg_ssm-2.5.3.dev1}/mtg_ssm.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ TODO.md
 pylintrc
 pyproject.toml
 .github/dependabot.yml
+.github/workflows/integration.yml
 .github/workflows/pre-commit.yml
 .github/workflows/publish.yml
 .github/workflows/run-tests.yml

mtg_ssm-2.5.2.dev2/mtg_ssm/_version.py

@@ -1,4 +0,0 @@
-# file generated by setuptools_scm
-# don't change, don't track in version control
-__version__ = version = '2.5.2.dev2'
-__version_tuple__ = version_tuple = (2, 5, 2, 'dev2')