spells-mtg 0.10.10__tar.gz → 0.10.11__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of spells-mtg might be problematic. Click here for more details.
- {spells_mtg-0.10.10 → spells_mtg-0.10.11}/PKG-INFO +1 -1
- {spells_mtg-0.10.10 → spells_mtg-0.10.11}/pyproject.toml +1 -1
- {spells_mtg-0.10.10 → spells_mtg-0.10.11}/spells/config.py +1 -0
- {spells_mtg-0.10.10 → spells_mtg-0.10.11}/spells/manifest.py +5 -6
- {spells_mtg-0.10.10 → spells_mtg-0.10.11}/LICENSE +0 -0
- {spells_mtg-0.10.10 → spells_mtg-0.10.11}/README.md +0 -0
- {spells_mtg-0.10.10 → spells_mtg-0.10.11}/spells/__init__.py +0 -0
- {spells_mtg-0.10.10 → spells_mtg-0.10.11}/spells/cache.py +0 -0
- {spells_mtg-0.10.10 → spells_mtg-0.10.11}/spells/cards.py +0 -0
- {spells_mtg-0.10.10 → spells_mtg-0.10.11}/spells/columns.py +0 -0
- {spells_mtg-0.10.10 → spells_mtg-0.10.11}/spells/draft_data.py +0 -0
- {spells_mtg-0.10.10 → spells_mtg-0.10.11}/spells/enums.py +0 -0
- {spells_mtg-0.10.10 → spells_mtg-0.10.11}/spells/extension.py +0 -0
- {spells_mtg-0.10.10 → spells_mtg-0.10.11}/spells/external.py +0 -0
- {spells_mtg-0.10.10 → spells_mtg-0.10.11}/spells/filter.py +0 -0
- {spells_mtg-0.10.10 → spells_mtg-0.10.11}/spells/log.py +0 -0
- {spells_mtg-0.10.10 → spells_mtg-0.10.11}/spells/schema.py +0 -0
- {spells_mtg-0.10.10 → spells_mtg-0.10.11}/spells/utils.py +0 -0
- {spells_mtg-0.10.10 → spells_mtg-0.10.11}/tests/__init__.py +0 -0
- {spells_mtg-0.10.10 → spells_mtg-0.10.11}/tests/filter_test.py +0 -0
- {spells_mtg-0.10.10 → spells_mtg-0.10.11}/tests/utils_test.py +0 -0
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
from dataclasses import dataclass
|
|
2
2
|
|
|
3
|
-
import spells.
|
|
4
|
-
import spells.filter
|
|
3
|
+
import spells.filter as spells_filter
|
|
5
4
|
from spells.enums import View, ColName, ColType
|
|
6
|
-
from spells.columns import ColDef
|
|
5
|
+
from spells.columns import ColDef, default_columns
|
|
7
6
|
|
|
8
7
|
|
|
9
8
|
@dataclass(frozen=True)
|
|
@@ -13,7 +12,7 @@ class Manifest:
|
|
|
13
12
|
base_view_group_by: frozenset[str]
|
|
14
13
|
view_cols: dict[View, frozenset[str]]
|
|
15
14
|
group_by: tuple[str, ...]
|
|
16
|
-
filter:
|
|
15
|
+
filter: spells_filter.Filter | None
|
|
17
16
|
|
|
18
17
|
def __post_init__(self):
|
|
19
18
|
# No name filter check
|
|
@@ -166,7 +165,7 @@ def create(
|
|
|
166
165
|
gbs = (ColName.NAME,) if group_by is None else tuple(group_by)
|
|
167
166
|
|
|
168
167
|
if columns is None:
|
|
169
|
-
cols = tuple(
|
|
168
|
+
cols = tuple(default_columns)
|
|
170
169
|
if ColName.NAME not in gbs:
|
|
171
170
|
cols = tuple(
|
|
172
171
|
col for col in cols if col not in (ColName.COLOR, ColName.RARITY)
|
|
@@ -174,7 +173,7 @@ def create(
|
|
|
174
173
|
else:
|
|
175
174
|
cols = tuple(columns)
|
|
176
175
|
|
|
177
|
-
m_filter =
|
|
176
|
+
m_filter = spells_filter.from_spec(filter_spec)
|
|
178
177
|
|
|
179
178
|
col_set = frozenset(cols)
|
|
180
179
|
col_set = col_set.union(frozenset(gbs) - {ColName.NAME})
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|