numbers-parser 4.21.0__tar.gz → 4.22.0__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.
- {numbers_parser-4.21.0/src/numbers_parser.egg-info → numbers_parser-4.22.0}/PKG-INFO +1 -1
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/pyproject.toml +9 -2
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/cell.py +6 -1
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/constants.py +24 -20
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/document.py +10 -7
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/model.py +101 -1
- {numbers_parser-4.21.0 → numbers_parser-4.22.0/src/numbers_parser.egg-info}/PKG-INFO +1 -1
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_formatting.py +15 -1
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_issues.py +8 -2
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_styles.py +0 -32
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/LICENSE.rst +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/README.md +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/setup.cfg +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/__init__.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/_cat_numbers.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/_csv2numbers.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/_unpack_numbers.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/bullets.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/containers.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/currencies.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/data/empty.numbers +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/exceptions.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/experimental.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/formula.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TNArchives_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TNArchives_sos_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TNCommandArchives_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TNCommandArchives_sos_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSAArchives_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSAArchives_sos_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSACommandArchives_sos_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSCEArchives_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSCH3DArchives_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSCHArchives_Common_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSCHArchives_GEN_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSCHArchives_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSCHArchives_sos_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSCHCommandArchives_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSCHPreUFFArchives_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSCKArchives_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSCKArchives_sos_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSDArchives_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSDArchives_sos_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSDCommandArchives_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSKArchives_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSPArchiveMessages_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSPDatabaseMessages_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSPMessages_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSSArchives_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSSArchives_sos_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSTArchives_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSTArchives_sos_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSTCommandArchives_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSTStylePropertyArchiving_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSWPArchives_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSWPArchives_sos_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSWPCommandArchives_pb2.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/__init__.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/fontmap.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/functionmap.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/mapping.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/iwafile.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/iwork.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/numbers_cache.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/numbers_uuid.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/roman.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/xrefs.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser.egg-info/SOURCES.txt +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser.egg-info/dependency_links.txt +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser.egg-info/entry_points.txt +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser.egg-info/requires.txt +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser.egg-info/top_level.txt +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_all_formulas.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_api_change.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_borders.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_bullets.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_cat_numbers.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_categories.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_comments.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_coverage.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_create_cells.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_csv2numbers.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_currency.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_encrypted.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_folder.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_formulas.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_large.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_local_docs.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_memory_leaks.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_merges.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_package.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_properties.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_roman.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_save.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_slices.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_table_size.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_tables.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_unpack_numbers.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_unsupported.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_uuids.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_version.py +0 -0
- {numbers_parser-4.21.0 → numbers_parser-4.22.0}/tests/test_write_empty_cell.py +0 -0
|
@@ -24,7 +24,7 @@ classifiers = [
|
|
|
24
24
|
description = "Read and write Apple Numbers spreadsheets"
|
|
25
25
|
name = "numbers-parser"
|
|
26
26
|
readme = "README.md"
|
|
27
|
-
version = "4.
|
|
27
|
+
version = "4.22.0"
|
|
28
28
|
|
|
29
29
|
[project.urls]
|
|
30
30
|
repository = "https://github.com/masaccio/numbers-parser"
|
|
@@ -74,6 +74,13 @@ bootstrap = [
|
|
|
74
74
|
"pyobjc-framework-Cocoa>=10.2",
|
|
75
75
|
"py2app>=0.28",
|
|
76
76
|
]
|
|
77
|
+
visualcheck = [
|
|
78
|
+
"osascript>=0.0.27",
|
|
79
|
+
"pillow>=12.3.0",
|
|
80
|
+
"pixelmatch>=0.4.0",
|
|
81
|
+
"pymupdf>=1.28.2",
|
|
82
|
+
"rich>=15.0.0",
|
|
83
|
+
]
|
|
77
84
|
|
|
78
85
|
[build-system]
|
|
79
86
|
requires = ["setuptools >= 61.0"]
|
|
@@ -107,7 +114,7 @@ addopts = "--cov=src/numbers_parser --cov-report=html --cov-report=term-missing:
|
|
|
107
114
|
|
|
108
115
|
[tool.tox]
|
|
109
116
|
requires = ["tox>=4.0"]
|
|
110
|
-
env_list = ["py310", "py311", "py312", "py313"]
|
|
117
|
+
env_list = ["py310", "py311", "py312", "py313", "py314", "py315"]
|
|
111
118
|
|
|
112
119
|
[tool.tox.env_run_base]
|
|
113
120
|
deps = [
|
|
@@ -1456,6 +1456,8 @@ class Cell(CellStorageFlags, Cacheable):
|
|
|
1456
1456
|
self._control_id = control_id
|
|
1457
1457
|
elif format_type in [FormattingType.DATETIME, CustomFormattingType.DATETIME]:
|
|
1458
1458
|
self._date_format_id = format_id
|
|
1459
|
+
elif format_type == FormattingType.DURATION:
|
|
1460
|
+
self._duration_format_id = format_id
|
|
1459
1461
|
elif format_type in [FormattingType.TEXT, CustomFormattingType.TEXT]:
|
|
1460
1462
|
self._text_format_id = format_id
|
|
1461
1463
|
else:
|
|
@@ -1789,7 +1791,7 @@ def _expand_quotes(value: str) -> str:
|
|
|
1789
1791
|
return formatted_value
|
|
1790
1792
|
|
|
1791
1793
|
|
|
1792
|
-
def _decode_number_format( # noqa: PLR0912
|
|
1794
|
+
def _decode_number_format( # noqa: PLR0912, PLR0915
|
|
1793
1795
|
number_format: TSKArchives.FormatStructArchive,
|
|
1794
1796
|
value: float,
|
|
1795
1797
|
name: str,
|
|
@@ -2169,6 +2171,9 @@ class Formatting:
|
|
|
2169
2171
|
control_format: ControlFormattingType = ControlFormattingType.NUMBER
|
|
2170
2172
|
currency_code: str = "GBP"
|
|
2171
2173
|
date_time_format: str = DEFAULT_DATETIME_FORMAT
|
|
2174
|
+
duration_style: DurationStyle = DurationStyle.COMPACT
|
|
2175
|
+
duration_unit_largest: DurationUnits = None
|
|
2176
|
+
duration_unit_smallest: DurationUnits = None
|
|
2172
2177
|
decimal_places: int = None
|
|
2173
2178
|
fraction_accuracy: FractionAccuracy = FractionAccuracy.THREE
|
|
2174
2179
|
increment: float = 1.0
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
from datetime import datetime
|
|
2
|
-
from enum import IntEnum
|
|
2
|
+
from enum import IntEnum, auto
|
|
3
3
|
from importlib.resources import files
|
|
4
4
|
from math import ceil
|
|
5
5
|
|
|
@@ -229,28 +229,29 @@ class FormatType(IntEnum):
|
|
|
229
229
|
|
|
230
230
|
|
|
231
231
|
class FormattingType(IntEnum):
|
|
232
|
-
BASE =
|
|
233
|
-
CURRENCY =
|
|
234
|
-
DATETIME =
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
232
|
+
BASE = auto()
|
|
233
|
+
CURRENCY = auto()
|
|
234
|
+
DATETIME = auto()
|
|
235
|
+
DURATION = auto()
|
|
236
|
+
FRACTION = auto()
|
|
237
|
+
NUMBER = auto()
|
|
238
|
+
PERCENTAGE = auto()
|
|
239
|
+
SCIENTIFIC = auto()
|
|
240
|
+
TICKBOX = auto()
|
|
241
|
+
RATING = auto()
|
|
242
|
+
SLIDER = auto()
|
|
243
|
+
STEPPER = auto()
|
|
244
|
+
POPUP = auto()
|
|
245
|
+
TEXT = auto()
|
|
245
246
|
|
|
246
247
|
|
|
247
248
|
class ControlFormattingType(IntEnum):
|
|
248
|
-
BASE =
|
|
249
|
-
CURRENCY =
|
|
250
|
-
FRACTION =
|
|
251
|
-
NUMBER =
|
|
252
|
-
PERCENTAGE =
|
|
253
|
-
SCIENTIFIC =
|
|
249
|
+
BASE = auto()
|
|
250
|
+
CURRENCY = auto()
|
|
251
|
+
FRACTION = auto()
|
|
252
|
+
NUMBER = auto()
|
|
253
|
+
PERCENTAGE = auto()
|
|
254
|
+
SCIENTIFIC = auto()
|
|
254
255
|
|
|
255
256
|
|
|
256
257
|
class OwnerKind(IntEnum):
|
|
@@ -263,6 +264,7 @@ FORMATTING_ALLOWED_CELLS = {
|
|
|
263
264
|
"base": ["NumberCell"],
|
|
264
265
|
"currency": ["NumberCell"],
|
|
265
266
|
"datetime": ["DateCell"],
|
|
267
|
+
"duration": ["DurationCell"],
|
|
266
268
|
"fraction": ["NumberCell"],
|
|
267
269
|
"number": ["NumberCell"],
|
|
268
270
|
"percentage": ["NumberCell"],
|
|
@@ -352,6 +354,7 @@ ALLOWED_FORMATTING_PARAMETERS = {
|
|
|
352
354
|
"use_accounting_style",
|
|
353
355
|
],
|
|
354
356
|
FormattingType.DATETIME: ["date_time_format"],
|
|
357
|
+
FormattingType.DURATION: ["duration_style", "duration_unit_largest", "duration_unit_smallest"],
|
|
355
358
|
FormattingType.FRACTION: ["fraction_accuracy"],
|
|
356
359
|
FormattingType.NUMBER: [
|
|
357
360
|
"decimal_places",
|
|
@@ -386,6 +389,7 @@ FORMAT_TYPE_MAP = {
|
|
|
386
389
|
FormattingType.BASE: FormatType.BASE,
|
|
387
390
|
FormattingType.CURRENCY: FormatType.CURRENCY,
|
|
388
391
|
FormattingType.DATETIME: FormatType.DATE,
|
|
392
|
+
FormattingType.DURATION: FormatType.DURATION,
|
|
389
393
|
FormattingType.FRACTION: FormatType.FRACTION,
|
|
390
394
|
FormattingType.NUMBER: FormatType.DECIMAL,
|
|
391
395
|
FormattingType.PERCENTAGE: FormatType.PERCENT,
|
|
@@ -17,7 +17,6 @@ from numbers_parser.cell import (
|
|
|
17
17
|
MergedCell,
|
|
18
18
|
Style,
|
|
19
19
|
TextCell,
|
|
20
|
-
UnsupportedWarning,
|
|
21
20
|
)
|
|
22
21
|
from numbers_parser.constants import (
|
|
23
22
|
CUSTOM_FORMATTING_ALLOWED_CELLS,
|
|
@@ -79,7 +78,7 @@ class Document:
|
|
|
79
78
|
|
|
80
79
|
"""
|
|
81
80
|
|
|
82
|
-
def __init__(
|
|
81
|
+
def __init__( # noqa: PLR0917
|
|
83
82
|
self,
|
|
84
83
|
filename: str | Path | None = None,
|
|
85
84
|
sheet_name: str | None = "Sheet 1",
|
|
@@ -167,12 +166,11 @@ class Document:
|
|
|
167
166
|
if self._model.is_a_pivot_table(table._table_id):
|
|
168
167
|
table_name = self._model.table_name(table._table_id)
|
|
169
168
|
warn(
|
|
170
|
-
f"
|
|
171
|
-
|
|
169
|
+
f"Pivot table '{table_name}' may be corrupted by save.",
|
|
170
|
+
RuntimeWarning,
|
|
172
171
|
stacklevel=2,
|
|
173
172
|
)
|
|
174
|
-
|
|
175
|
-
self._model.recalculate_table_data(table._table_id, table._data)
|
|
173
|
+
self._model.recalculate_table_data(table._table_id, table._data)
|
|
176
174
|
self._model.save(Path(filename), package, password, hint)
|
|
177
175
|
|
|
178
176
|
def add_sheet(
|
|
@@ -460,7 +458,7 @@ class Sheet:
|
|
|
460
458
|
num_header_cols,
|
|
461
459
|
)
|
|
462
460
|
|
|
463
|
-
def _add_table(
|
|
461
|
+
def _add_table( # noqa: PLR0917
|
|
464
462
|
self,
|
|
465
463
|
table_name,
|
|
466
464
|
from_table_id,
|
|
@@ -1765,6 +1763,11 @@ class Table(Cacheable):
|
|
|
1765
1763
|
strftime-like formatting string of :ref:`Numbers date/time
|
|
1766
1764
|
directives <datetime_formats>`.
|
|
1767
1765
|
|
|
1766
|
+
:``"duration"``:
|
|
1767
|
+
* **duration_style** (*:py:class:`~numbers_parser.DurationStyle`, optional, default: DurationStyle.COMPACT*) - How the duration units are rendered.
|
|
1768
|
+
* **duration_unit_largest** (*:py:class:`~numbers_parser.DurationUnits`, optional, default: None*) - the first and largest duration unit to display
|
|
1769
|
+
* **duration_unit_smallest** (*:py:class:`~numbers_parser.DurationUnits`, optional, default: None*) - the last and smallest duration unit to display
|
|
1770
|
+
|
|
1768
1771
|
:``"fraction"``:
|
|
1769
1772
|
* **fraction_accuracy** (*:py:class:`~numbers_parser.FractionAccuracy`, optional, default: FractionAccuracy.THREE* - The
|
|
1770
1773
|
precision of the faction.
|
|
@@ -242,6 +242,7 @@ class _NumbersModel(Cacheable):
|
|
|
242
242
|
self.calculate_table_uuid_map()
|
|
243
243
|
|
|
244
244
|
def save(self, filepath: Path, package: bool, password: str, hint: str) -> None:
|
|
245
|
+
self.refresh_pivot_tables()
|
|
245
246
|
self.objects.save(filepath, package, password, hint)
|
|
246
247
|
|
|
247
248
|
def find_refs(self, ref: str) -> list:
|
|
@@ -563,6 +564,13 @@ class _NumbersModel(Cacheable):
|
|
|
563
564
|
range_control_max=formatting.maximum,
|
|
564
565
|
range_control_inc=formatting.increment,
|
|
565
566
|
)
|
|
567
|
+
elif format_type == FormattingType.STEPPER:
|
|
568
|
+
cell_spec = TSTArchives.CellSpecArchive(
|
|
569
|
+
interaction_type=CellInteractionType.STEPPER,
|
|
570
|
+
range_control_min=formatting.minimum,
|
|
571
|
+
range_control_max=formatting.maximum,
|
|
572
|
+
range_control_inc=formatting.increment,
|
|
573
|
+
)
|
|
566
574
|
else: # POPUP
|
|
567
575
|
popup_id = self.cell_popup_model(self._control_specs.id(table_id), formatting)
|
|
568
576
|
cell_spec = TSTArchives.CellSpecArchive(
|
|
@@ -1225,7 +1233,7 @@ class _NumbersModel(Cacheable):
|
|
|
1225
1233
|
self.update_cell_borders(table_id, data)
|
|
1226
1234
|
|
|
1227
1235
|
self.objects.remove_unreferenced_objects()
|
|
1228
|
-
|
|
1236
|
+
self.update_table_metadata_ranges(table_id, len(data), len(data[0]))
|
|
1229
1237
|
|
|
1230
1238
|
tile_idx = 0
|
|
1231
1239
|
max_tile_idx = len(data) >> 8
|
|
@@ -2827,6 +2835,98 @@ class _NumbersModel(Cacheable):
|
|
|
2827
2835
|
)
|
|
2828
2836
|
}
|
|
2829
2837
|
|
|
2838
|
+
def refresh_pivot_tables(self) -> None:
|
|
2839
|
+
"""
|
|
2840
|
+
Signal a data refresh for pivot tables on next load by bumping their
|
|
2841
|
+
refresh UUIDs and timestamps, while leaving rule UUIDs intact to
|
|
2842
|
+
preserve layout and styling.
|
|
2843
|
+
"""
|
|
2844
|
+
for sheet_id in self.sheet_ids():
|
|
2845
|
+
for table_id in self.table_ids(sheet_id):
|
|
2846
|
+
if not self.is_a_pivot_table(table_id):
|
|
2847
|
+
continue
|
|
2848
|
+
|
|
2849
|
+
table_model = self.objects[table_id]
|
|
2850
|
+
pivot_owner_id = table_model.pivot_owner.identifier
|
|
2851
|
+
pivot_owner = self.objects[pivot_owner_id]
|
|
2852
|
+
|
|
2853
|
+
# Only touch the data refresh trackers. Do not alter rule UUIDs.
|
|
2854
|
+
pivot_owner.refresh_uid.CopyFrom(NumbersUUID().protobuf2)
|
|
2855
|
+
pivot_owner.refresh_timestamp = (datetime.now() - EPOCH).total_seconds() # noqa: DTZ005
|
|
2856
|
+
|
|
2857
|
+
def update_table_metadata_ranges(self, table_id: int, num_rows: int, num_cols: int) -> None:
|
|
2858
|
+
"""Keep UID maps and dependency bounds in sync with data dimensions."""
|
|
2859
|
+
table_model = self.objects[table_id]
|
|
2860
|
+
|
|
2861
|
+
def _update_map(uid_map_ref):
|
|
2862
|
+
if not uid_map_ref or uid_map_ref.identifier == 0:
|
|
2863
|
+
return
|
|
2864
|
+
uid_map = self.objects[uid_map_ref.identifier]
|
|
2865
|
+
|
|
2866
|
+
col_uuids = [
|
|
2867
|
+
NumbersUUID(uid_map.sorted_column_uids[i]) for i in uid_map.column_uid_for_index
|
|
2868
|
+
]
|
|
2869
|
+
row_uuids = [NumbersUUID(uid_map.sorted_row_uids[i]) for i in uid_map.row_uid_for_index]
|
|
2870
|
+
|
|
2871
|
+
if num_cols > len(col_uuids):
|
|
2872
|
+
col_uuids.extend([NumbersUUID() for _ in range(num_cols - len(col_uuids))])
|
|
2873
|
+
elif num_cols < len(col_uuids):
|
|
2874
|
+
col_uuids = col_uuids[:num_cols]
|
|
2875
|
+
|
|
2876
|
+
if num_rows > len(row_uuids):
|
|
2877
|
+
row_uuids.extend([NumbersUUID() for _ in range(num_rows - len(row_uuids))])
|
|
2878
|
+
elif num_rows < len(row_uuids):
|
|
2879
|
+
row_uuids = row_uuids[:num_rows]
|
|
2880
|
+
|
|
2881
|
+
sorted_col_uuids = sorted(col_uuids, key=lambda x: x.int)
|
|
2882
|
+
sorted_row_uuids = sorted(row_uuids, key=lambda x: x.int)
|
|
2883
|
+
|
|
2884
|
+
clear_field_container(uid_map.sorted_column_uids)
|
|
2885
|
+
for u in sorted_col_uuids:
|
|
2886
|
+
uid_map.sorted_column_uids.append(u.protobuf2)
|
|
2887
|
+
|
|
2888
|
+
clear_field_container(uid_map.column_uid_for_index)
|
|
2889
|
+
clear_field_container(uid_map.column_index_for_uid)
|
|
2890
|
+
for _ in sorted_col_uuids:
|
|
2891
|
+
uid_map.column_index_for_uid.append(0)
|
|
2892
|
+
for col_idx, u in enumerate(col_uuids):
|
|
2893
|
+
sorted_idx = sorted_col_uuids.index(u)
|
|
2894
|
+
uid_map.column_uid_for_index.append(sorted_idx)
|
|
2895
|
+
uid_map.column_index_for_uid[sorted_idx] = col_idx
|
|
2896
|
+
|
|
2897
|
+
clear_field_container(uid_map.sorted_row_uids)
|
|
2898
|
+
for u in sorted_row_uuids:
|
|
2899
|
+
uid_map.sorted_row_uids.append(u.protobuf2)
|
|
2900
|
+
|
|
2901
|
+
clear_field_container(uid_map.row_uid_for_index)
|
|
2902
|
+
clear_field_container(uid_map.row_index_for_uid)
|
|
2903
|
+
for _ in sorted_row_uuids:
|
|
2904
|
+
uid_map.row_index_for_uid.append(0)
|
|
2905
|
+
for row_idx, u in enumerate(row_uuids):
|
|
2906
|
+
sorted_idx = sorted_row_uuids.index(u)
|
|
2907
|
+
uid_map.row_uid_for_index.append(sorted_idx)
|
|
2908
|
+
uid_map.row_index_for_uid[sorted_idx] = row_idx
|
|
2909
|
+
|
|
2910
|
+
_update_map(table_model.base_column_row_uids)
|
|
2911
|
+
|
|
2912
|
+
table_info_id = self.table_info_id(table_id)
|
|
2913
|
+
table_info = self.objects[table_info_id]
|
|
2914
|
+
_update_map(table_info.view_column_row_uids)
|
|
2915
|
+
|
|
2916
|
+
calc_engine = self.calc_engine()
|
|
2917
|
+
for dep_ref in calc_engine.dependency_tracker.formula_owner_dependencies:
|
|
2918
|
+
dep_archive = self.objects[dep_ref.identifier]
|
|
2919
|
+
if (
|
|
2920
|
+
dep_archive.owner_kind == OwnerKind.TABLE_MODEL
|
|
2921
|
+
and dep_archive.formula_owner.identifier == table_info_id
|
|
2922
|
+
):
|
|
2923
|
+
for field in ["spanning_column_dependencies", "spanning_row_dependencies"]:
|
|
2924
|
+
spanning = getattr(dep_archive, field)
|
|
2925
|
+
spanning.total_range_for_table.bottom_right_row = num_rows - 1
|
|
2926
|
+
spanning.total_range_for_table.bottom_right_column = num_cols - 1
|
|
2927
|
+
spanning.body_range_for_table.bottom_right_row = num_rows - 1
|
|
2928
|
+
spanning.body_range_for_table.bottom_right_column = num_cols - 1
|
|
2929
|
+
|
|
2830
2930
|
|
|
2831
2931
|
def rgb(obj) -> RGB:
|
|
2832
2932
|
"""Convert a TSPArchives.Color into an RGB tuple."""
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
from datetime import datetime
|
|
1
|
+
from datetime import datetime, timedelta
|
|
2
2
|
|
|
3
3
|
import pytest
|
|
4
4
|
import pytest_check as check
|
|
@@ -6,6 +6,8 @@ import pytest_check as check
|
|
|
6
6
|
from numbers_parser import (
|
|
7
7
|
ControlFormattingType,
|
|
8
8
|
Document,
|
|
9
|
+
DurationStyle,
|
|
10
|
+
DurationUnits,
|
|
9
11
|
EmptyCell,
|
|
10
12
|
FractionAccuracy,
|
|
11
13
|
NegativeNumberStyle,
|
|
@@ -434,6 +436,15 @@ def test_write_date_format(configurable_save_file):
|
|
|
434
436
|
table.write(row, col, ref_date)
|
|
435
437
|
table.set_cell_formatting(row, col, "datetime", date_time_format=date_time_format)
|
|
436
438
|
|
|
439
|
+
table.write(row + 1, 0, timedelta(days=1, hours=2))
|
|
440
|
+
table.set_cell_formatting(
|
|
441
|
+
row + 1,
|
|
442
|
+
0,
|
|
443
|
+
"duration",
|
|
444
|
+
duration_style=DurationStyle.LONG,
|
|
445
|
+
duration_unit_largest=DurationUnits.DAY,
|
|
446
|
+
duration_unit_smallest=DurationUnits.MINUTE,
|
|
447
|
+
)
|
|
437
448
|
doc.save(configurable_save_file)
|
|
438
449
|
|
|
439
450
|
doc = Document(configurable_save_file)
|
|
@@ -443,6 +454,9 @@ def test_write_date_format(configurable_save_file):
|
|
|
443
454
|
check.equal(table.cell(row, col).value, ref_date)
|
|
444
455
|
check.equal(table.cell(row, col).formatted_value, ref_value)
|
|
445
456
|
|
|
457
|
+
check.equal(table.cell(row + 1, 0).value, timedelta(days=1, hours=2))
|
|
458
|
+
check.equal(table.cell(row + 1, 0).formatted_value, "1 day 2 hours 0 minutes")
|
|
459
|
+
|
|
446
460
|
|
|
447
461
|
def test_write_numbers_format(configurable_save_file):
|
|
448
462
|
doc = Document(num_header_cols=0, num_header_rows=0, num_cols=8, num_rows=10)
|
|
@@ -423,9 +423,15 @@ def test_issue_69():
|
|
|
423
423
|
|
|
424
424
|
def test_issue_73(configurable_save_file):
|
|
425
425
|
doc = Document("tests/data/issue-73.numbers")
|
|
426
|
-
|
|
426
|
+
table = doc.sheets[0].tables["Table 1"]
|
|
427
|
+
table.write("A4", "foo")
|
|
428
|
+
table.write("B4", 10)
|
|
429
|
+
|
|
430
|
+
with pytest.warns(
|
|
431
|
+
RuntimeWarning, match="Pivot table 'Table 1 Pivot' may be corrupted by save."
|
|
432
|
+
):
|
|
427
433
|
doc.save(configurable_save_file)
|
|
428
|
-
|
|
434
|
+
doc.save(configurable_save_file)
|
|
429
435
|
|
|
430
436
|
|
|
431
437
|
def test_issue_74_1(configurable_save_file):
|
|
@@ -168,38 +168,6 @@ def test_all_styles(configurable_save_file):
|
|
|
168
168
|
assert check_style(cell.style, **attrs)
|
|
169
169
|
|
|
170
170
|
|
|
171
|
-
@pytest.mark.experimental
|
|
172
|
-
def test_all_styles_visual_check(configurable_save_file):
|
|
173
|
-
print("\n\n************** VISUAL CHECKS OF STYLES **************")
|
|
174
|
-
|
|
175
|
-
doc = Document("tests/data/test-styles.numbers")
|
|
176
|
-
table = doc.sheets["Styles"].tables[0]
|
|
177
|
-
|
|
178
|
-
new_doc = Document()
|
|
179
|
-
new_table = new_doc.default_table
|
|
180
|
-
for row in range(table.num_rows):
|
|
181
|
-
new_table.row_height(table.row_height(row))
|
|
182
|
-
for col in range(table.num_cols):
|
|
183
|
-
new_table.col_width(table.col_width(col))
|
|
184
|
-
|
|
185
|
-
for row in range(table.num_rows):
|
|
186
|
-
for col in range(table.num_cols):
|
|
187
|
-
cell = table.cell(row, col)
|
|
188
|
-
if not cell.value:
|
|
189
|
-
continue
|
|
190
|
-
attrs = decode_style_attrs(cell.value)
|
|
191
|
-
if "name" in attrs:
|
|
192
|
-
del attrs["name"]
|
|
193
|
-
print(f"@[{cell.row},{cell.col}: {attrs}")
|
|
194
|
-
cell_str = "\n".join([f"{k}={v}" for k, v in attrs.items()])
|
|
195
|
-
style = doc.add_style(**attrs)
|
|
196
|
-
new_table.write(row, col, cell_str)
|
|
197
|
-
new_table.set_cell_style(row, col, style)
|
|
198
|
-
|
|
199
|
-
print(f"\n\n*** Saving {configurable_save_file} for visual check")
|
|
200
|
-
new_doc.save(configurable_save_file)
|
|
201
|
-
|
|
202
|
-
|
|
203
171
|
def test_all_style_changes(configurable_save_file):
|
|
204
172
|
# Flip styles and re-save as new custom styles
|
|
205
173
|
doc = Document("tests/data/test-styles.numbers")
|
|
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
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TNArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TNArchives_sos_pb2.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSAArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSAArchives_sos_pb2.py
RENAMED
|
File without changes
|
|
File without changes
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSCEArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSCH3DArchives_pb2.py
RENAMED
|
File without changes
|
|
File without changes
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSCHArchives_GEN_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSCHArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSCHArchives_sos_pb2.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSCKArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSCKArchives_sos_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSDArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSDArchives_sos_pb2.py
RENAMED
|
File without changes
|
|
File without changes
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSKArchives_pb2.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSPMessages_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSSArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSSArchives_sos_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSTArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSTArchives_sos_pb2.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSWPArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser/generated/TSWPArchives_sos_pb2.py
RENAMED
|
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
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser.egg-info/dependency_links.txt
RENAMED
|
File without changes
|
{numbers_parser-4.21.0 → numbers_parser-4.22.0}/src/numbers_parser.egg-info/entry_points.txt
RENAMED
|
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
|
|
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
|