numbers-parser 4.13.2__tar.gz → 4.14.1__tar.gz

numbers_parser-4.13.2/README.md → numbers_parser-4.14.1/PKG-INFO

@@ -1,3 +1,32 @@
+Metadata-Version: 2.1
+Name: numbers-parser
+Version: 4.14.1
+Summary: Read and write Apple Numbers spreadsheets
+Home-page: https://github.com/masaccio/numbers-parser
+License: MIT
+Author: Jon Connell
+Author-email: python@figsandfudge.com
+Requires-Python: >=3.9,<4.0
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+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: Topic :: Office/Business :: Financial :: Spreadsheet
+Requires-Dist: compact-json (>=1.1.3,<2.0.0)
+Requires-Dist: enum-tools (>=0.11)
+Requires-Dist: importlib-resources (>=6.1)
+Requires-Dist: protobuf
+Requires-Dist: python-dateutil (>=2.9.0.post0,<3.0.0)
+Requires-Dist: python-snappy (>=0.7,<0.8)
+Requires-Dist: setuptools (>=70.0.0)
+Requires-Dist: sigfig (>=1.3.3,<2.0.0)
+Project-URL: Documentation, https://github.com/masaccio/numbers-parser/blob/main/README.md
+Project-URL: Repository, https://github.com/masaccio/numbers-parser
+Description-Content-Type: text/markdown
+
 # numbers-parser
 
 [![Test Status](https://github.com/masaccio/numbers-parser/actions/workflows/run-all-tests.yml/badge.svg)](https://github.com/masaccio/numbers-parser/actions/workflows/run-all-tests.yml)[![Security Checks](https://github.com/masaccio/numbers-parser/actions/workflows/codeql.yml/badge.svg)](https://github.com/masaccio/numbers-parser/actions/workflows/codeql.yml)[![Code Coverage](https://codecov.io/gh/masaccio/numbers-parser/branch/main/graph/badge.svg?token=EKIUFGT05E)](https://codecov.io/gh/masaccio/numbers-parser)[![PyPI Version](https://badge.fury.io/py/numbers-parser.svg)](https://badge.fury.io/py/numbers-parser)
@@ -97,21 +126,7 @@ the column values.
 
 Cells are objects with a common base class of `Cell`. All cell types
 have a property `value` which returns the contents of the cell as a
-python datatype. `numbers-parser` uses
-[pendulum](https://pendulum.eustace.io) instead of python’s builtin
-types. Available cell types are:
-
-| Cell type    | value type          | Additional properties                                                                                  |
-|--------------|---------------------|--------------------------------------------------------------------------------------------------------|
-| NumberCell   | `float`             |                                                                                                        |
-| TextCell     | `str`               |                                                                                                        |
-| RichTextCell | `str`               | See [Rich text](https://masaccio.github.io/numbers-parser/api/cells.html#numbers_parser.RichTextCell)  |
-| EmptyCell    | `None`              |                                                                                                        |
-| BoolCell     | `bool`              |                                                                                                        |
-| DateCell     | `pendulum.datetime` |                                                                                                        |
-| DurationCell | `pendulum.duration` |                                                                                                        |
-| ErrorCell    | `None`              |                                                                                                        |
-| MergedCell   | `None`              | See [Merged cells](https://masaccio.github.io/numbers-parser/api/cells.html#numbers_parser.MergedCell) |
+python datatype. Available cell types are:
 
 Cell references can be either zero-offset row/column integers or an
 Excel/Numbers A1 notation. Where cell values are not `None` the
@@ -478,3 +493,4 @@ The following limitations are expected to always remain:
 ## License
 
 All code in this repository is licensed under the [MIT License](https://github.com/masaccio/numbers-parser/blob/master/LICENSE.rst).
+

numbers_parser-4.13.2/PKG-INFO → numbers_parser-4.14.1/README.md

@@ -1,35 +1,3 @@
-Metadata-Version: 2.1
-Name: numbers-parser
-Version: 4.13.2
-Summary: Read and write Apple Numbers spreadsheets
-Home-page: https://github.com/masaccio/numbers-parser
-License: MIT
-Author: Jon Connell
-Author-email: python@figsandfudge.com
-Requires-Python: >=3.9,<4.0
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3
-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: Topic :: Office/Business :: Financial :: Spreadsheet
-Requires-Dist: colorama (>=0.4.6,<0.5.0)
-Requires-Dist: compact-json (>=1.1.3,<2.0.0)
-Requires-Dist: enum-tools (>=0.11)
-Requires-Dist: importlib-resources (>=6.1)
-Requires-Dist: pendulum (>=3.0,<4.0)
-Requires-Dist: protobuf
-Requires-Dist: python-snappy (>=0.7,<0.8)
-Requires-Dist: regex (>2024.0)
-Requires-Dist: roman (>=4.0)
-Requires-Dist: setuptools (>=69.0.3)
-Requires-Dist: sigfig (>=1.3.2,<2.0.0)
-Project-URL: Documentation, https://github.com/masaccio/numbers-parser/blob/main/README.md
-Project-URL: Repository, https://github.com/masaccio/numbers-parser
-Description-Content-Type: text/markdown
-
 # numbers-parser
 
 [![Test Status](https://github.com/masaccio/numbers-parser/actions/workflows/run-all-tests.yml/badge.svg)](https://github.com/masaccio/numbers-parser/actions/workflows/run-all-tests.yml)[![Security Checks](https://github.com/masaccio/numbers-parser/actions/workflows/codeql.yml/badge.svg)](https://github.com/masaccio/numbers-parser/actions/workflows/codeql.yml)[![Code Coverage](https://codecov.io/gh/masaccio/numbers-parser/branch/main/graph/badge.svg?token=EKIUFGT05E)](https://codecov.io/gh/masaccio/numbers-parser)[![PyPI Version](https://badge.fury.io/py/numbers-parser.svg)](https://badge.fury.io/py/numbers-parser)
@@ -129,21 +97,7 @@ the column values.
 
 Cells are objects with a common base class of `Cell`. All cell types
 have a property `value` which returns the contents of the cell as a
-python datatype. `numbers-parser` uses
-[pendulum](https://pendulum.eustace.io) instead of python’s builtin
-types. Available cell types are:
-
-| Cell type    | value type          | Additional properties                                                                                  |
-|--------------|---------------------|--------------------------------------------------------------------------------------------------------|
-| NumberCell   | `float`             |                                                                                                        |
-| TextCell     | `str`               |                                                                                                        |
-| RichTextCell | `str`               | See [Rich text](https://masaccio.github.io/numbers-parser/api/cells.html#numbers_parser.RichTextCell)  |
-| EmptyCell    | `None`              |                                                                                                        |
-| BoolCell     | `bool`              |                                                                                                        |
-| DateCell     | `pendulum.datetime` |                                                                                                        |
-| DurationCell | `pendulum.duration` |                                                                                                        |
-| ErrorCell    | `None`              |                                                                                                        |
-| MergedCell   | `None`              | See [Merged cells](https://masaccio.github.io/numbers-parser/api/cells.html#numbers_parser.MergedCell) |
+python datatype. Available cell types are:
 
 Cell references can be either zero-offset row/column integers or an
 Excel/Numbers A1 notation. Where cell values are not `None` the
@@ -510,4 +464,3 @@ The following limitations are expected to always remain:
 ## License
 
 All code in this repository is licensed under the [MIT License](https://github.com/masaccio/numbers-parser/blob/master/LICENSE.rst).
-

{numbers_parser-4.13.2 → numbers_parser-4.14.1}/pyproject.toml

@@ -12,7 +12,7 @@ name = "numbers-parser"
 packages = [{include = "numbers_parser", from = "src"}]
 readme = "README.md"
 repository = "https://github.com/masaccio/numbers-parser"
-version = "4.13.2"
+version = "4.14.1"
 
 [tool.poetry.scripts]
 cat-numbers = "numbers_parser._cat_numbers:main"
@@ -21,17 +21,14 @@ csv2numbers = "numbers_parser._csv2numbers:main"
 
 [tool.poetry.dependencies]
 compact-json = "^1.1.3"
-pendulum = "^3.0"
 protobuf = "*"
 python = ">=3.9,<4.0"
 python-snappy = "^0.7"
-regex = ">=2022.9.13,>2023.0,>2024.0"
-roman = ">=3.3,>=4.0"
-sigfig = "^1.3.2"
-setuptools = ">=69.0.3"
+sigfig = "^1.3.3"
+setuptools = ">=70.0.0"
 importlib-resources = ">=6.1"
 enum-tools = ">=0.11"
-colorama = "^0.4.6"
+python-dateutil = "^2.9.0.post0"
 
 [tool.poetry.group.dev.dependencies]
 black = "*"
@@ -43,12 +40,13 @@ pytest = ">=7.2.0"
 pytest-check = ">=1.0"
 pytest-console-scripts = "^1.3.1"
 pytest-cov = ">=4.0,>=5.0"
-pytest-profiling = "^1.7.0"
 pytest-xdist = "^3.3.1"
 ruff = "*"
 tox = "^4.11.4"
 python-magic = ">=0.4"
 tqdm = ">=4.66"
+colorama = "^0.4.6"
+roman = "^4.2"
 
 [tool.poetry.group.docs]
 optional = true
@@ -88,7 +86,7 @@ addopts = "--cov=src/numbers_parser --cov-report=html --cov-report=term-missing:
 legacy_tox_ini = """
 [tox]
 isolated_build = true
-envlist = py39, py310, py311, py312
+envlist = py39, py310, py311, py312, py313
 [testenv]
 deps =
   pytest

{numbers_parser-4.13.2 → numbers_parser-4.14.1}/src/numbers_parser/__init__.py

@@ -37,7 +37,8 @@ def _check_installed_numbers_version():
     installed_version = re.sub(r"(\d+)\.(\d+)\.\d+", r"\1.\2", installed_version)
     if installed_version not in SUPPORTED_NUMBERS_VERSIONS:
         warnings.warn(
-            f"Numbers version {installed_version} not tested with this version", stacklevel=2,
+            f"Numbers version {installed_version} not tested with this version",
+            stacklevel=2,
         )
     fp.close()
     return installed_version

{numbers_parser-4.13.2 → numbers_parser-4.14.1}/src/numbers_parser/_cat_numbers.py

@@ -3,7 +3,7 @@ import csv
 import logging
 import sys
 
-import sigfig
+from sigfig import round as sigfig
 
 from numbers_parser import Document, ErrorCell, FileError, FileFormatError, NumberCell, _get_version
 from numbers_parser import __name__ as numbers_parser_name
@@ -49,15 +49,24 @@ def command_line_parser():
         help="Dump formatted cells (durations) as they appear in Numbers",
     )
     parser.add_argument(
-        "-s", "--sheet", action="append", help="Names of sheet(s) to include in export",
+        "-s",
+        "--sheet",
+        action="append",
+        help="Names of sheet(s) to include in export",
     )
     parser.add_argument(
-        "-t", "--table", action="append", help="Names of table(s) to include in export",
+        "-t",
+        "--table",
+        action="append",
+        help="Names of table(s) to include in export",
     )
     parser.add_argument("document", nargs="*", help="Document(s) to export")
     parser.add_argument("--debug", default=False, action="store_true", help="Enable debug logging")
     parser.add_argument(
-        "--experimental", default=False, action="store_true", help=argparse.SUPPRESS,
+        "--experimental",
+        default=False,
+        action="store_true",
+        help=argparse.SUPPRESS,
     )
     return parser
 
@@ -81,7 +90,7 @@ def cell_as_string(args, cell):
     elif args.formatting and cell.formatted_value is not None:
         return cell.formatted_value
     elif isinstance(cell, NumberCell):
-        return sigfig.round(cell.value, sigfigs=MAX_SIGNIFICANT_DIGITS, warn=False)
+        return sigfig(cell.value, sigfigs=MAX_SIGNIFICANT_DIGITS, warn=False)
     elif cell.value is None:
         return ""
     else:

{numbers_parser-4.13.2 → numbers_parser-4.14.1}/src/numbers_parser/_csv2numbers.py

@@ -33,6 +33,7 @@ class Converter:
     no_header: bool = False
     reverse: bool = False
     whitespace: bool = None
+    encoding: str = "utf-8"
 
     def __post_init__(self: Converter) -> None:
         """Parse CSV file with Pandas and return a dataframe."""
@@ -45,7 +46,7 @@ class Converter:
             dialect = csv.excel
             dialect.strict = True
             lineno = 1
-            with open(self.input_filename) as csvfile:
+            with open(self.input_filename, encoding=self.encoding) as csvfile:
                 csvreader = csv.reader(csvfile, dialect=dialect)
                 if self.no_header:
                     self.header = None
@@ -333,6 +334,12 @@ def command_line_parser() -> argparse.ArgumentParser:
         action="store_true",
         help="dates are represented day first in the CSV file (default: false)",
     )
+    parser.add_argument(
+        "--encoding",
+        required=False,
+        default="utf-8",
+        help="python-style text encoding of the CSV file (default: utf-8)",
+    )
     parser.add_argument(
         "--date",
         metavar="COLUMNS",
@@ -400,6 +407,7 @@ def main() -> None:
                 date_columns=args.date,
                 input_filename=input_filename,
                 output_filename=output_filename,
+                encoding=args.encoding,
             )
 
             converter.transform_columns(args.transform)

{numbers_parser-4.13.2 → numbers_parser-4.14.1}/src/numbers_parser/_unpack_numbers.py

@@ -11,7 +11,6 @@ from binascii import hexlify
 from dataclasses import dataclass
 from pathlib import Path
 
-import regex
 from compact_json import Formatter
 
 from numbers_parser import __name__ as numbers_parser_name
@@ -35,7 +34,7 @@ class NumbersUnpacker(IWorkHandler):
 
     def store_file(self, filename: str, blob: bytes) -> None:
         """Store a profobuf archive."""
-        filename = regex.sub(r".*\.numbers/", "", str(filename))
+        filename = re.sub(r".*\.numbers/", "", str(filename))
         self.ensure_directory_exists(filename)
         target_path = os.path.join(self.output_dir, filename)
         if isinstance(blob, IWAFile):
@@ -102,7 +101,7 @@ class NumbersUnpacker(IWorkHandler):
                 elif k in ["cell_offsets", k == "cell_offsets_pre_bnc"]:
                     offsets = array("h", b64decode(obj[k])).tolist()
                     obj[k] = ",".join([str(x) for x in offsets])
-                    obj[k] = regex.sub(r"(?:,-1)+$", ",[...]", obj[k])
+                    obj[k] = re.sub(r"(?:,-1)+$", ",[...]", obj[k])
         else:  # list
             for v in obj:
                 if isinstance(v, (dict, list)):

{numbers_parser-4.13.2 → numbers_parser-4.14.1}/src/numbers_parser/bullets.py

@@ -1,6 +1,5 @@
-from roman import toRoman
-
 from numbers_parser.generated.TSWPArchives_pb2 import ListStyleArchive
+from numbers_parser.roman import to_roman
 
 BULLET_PREFIXES = {
     ListStyleArchive.kNumericDecimal: "",
@@ -24,12 +23,12 @@ BULLET_CONVERSION = {
     ListStyleArchive.kNumericDecimal: lambda x: str(x + 1),
     ListStyleArchive.kNumericDoubleParen: lambda x: str(x + 1),
     ListStyleArchive.kNumericRightParen: lambda x: str(x + 1),
-    ListStyleArchive.kRomanUpperDecimal: lambda x: toRoman(x + 1),
-    ListStyleArchive.kRomanUpperDoubleParen: lambda x: toRoman(x + 1),
-    ListStyleArchive.kRomanUpperRightParen: lambda x: toRoman(x + 1),
-    ListStyleArchive.kRomanLowerDecimal: lambda x: toRoman(x + 1).lower(),
-    ListStyleArchive.kRomanLowerDoubleParen: lambda x: toRoman(x + 1).lower(),
-    ListStyleArchive.kRomanLowerRightParen: lambda x: toRoman(x + 1).lower(),
+    ListStyleArchive.kRomanUpperDecimal: lambda x: to_roman(x + 1),
+    ListStyleArchive.kRomanUpperDoubleParen: lambda x: to_roman(x + 1),
+    ListStyleArchive.kRomanUpperRightParen: lambda x: to_roman(x + 1),
+    ListStyleArchive.kRomanLowerDecimal: lambda x: to_roman(x + 1).lower(),
+    ListStyleArchive.kRomanLowerDoubleParen: lambda x: to_roman(x + 1).lower(),
+    ListStyleArchive.kRomanLowerRightParen: lambda x: to_roman(x + 1).lower(),
     ListStyleArchive.kAlphaUpperDecimal: lambda x: chr(x + 65),
     ListStyleArchive.kAlphaUpperDoubleParen: lambda x: chr(x + 65),
     ListStyleArchive.kAlphaUpperRightParen: lambda x: chr(x + 65),

{numbers_parser-4.13.2 → numbers_parser-4.14.1}/src/numbers_parser/cell.py

@@ -3,8 +3,7 @@ import math
 import re
 from collections import namedtuple
 from dataclasses import asdict, dataclass, field, fields
-from datetime import datetime as builtin_datetime
-from datetime import timedelta as builtin_timedelta
+from datetime import datetime, timedelta
 from enum import IntEnum
 from fractions import Fraction
 from hashlib import sha1
@@ -13,13 +12,9 @@ from struct import pack, unpack
 from typing import Any, List, Optional, Tuple, Union
 from warnings import warn
 
-import sigfig
-from pendulum import DateTime, Duration, datetime, duration
-from pendulum import instance as pendulum_instance
+from sigfig import round as sigfig
 
 from numbers_parser import __name__ as numbers_parser_name
-
-# from numbers_parser.cell_storage import CellStorage, CellType
 from numbers_parser.constants import (
     CHECKBOX_FALSE_VALUE,
     CHECKBOX_TRUE_VALUE,
@@ -802,7 +797,7 @@ class Cell(CellStorageFlags, Cacheable):
         elif isinstance(value, int):
             cell = NumberCell(row, col, value)
         elif isinstance(value, float):
-            rounded_value = sigfig.round(value, sigfigs=MAX_SIGNIFICANT_DIGITS, warn=False)
+            rounded_value = sigfig(value, sigfigs=MAX_SIGNIFICANT_DIGITS, warn=False)
             if rounded_value != value:
                 warn(
                     f"'{value}' rounded to {MAX_SIGNIFICANT_DIGITS} significant digits",
@@ -810,9 +805,9 @@ class Cell(CellStorageFlags, Cacheable):
                     stacklevel=2,
                 )
             cell = NumberCell(row, col, rounded_value)
-        elif isinstance(value, (DateTime, builtin_datetime)):
-            cell = DateCell(row, col, pendulum_instance(value))
-        elif isinstance(value, (Duration, builtin_timedelta)):
+        elif isinstance(value, datetime):
+            cell = DateCell(row, col, value)
+        elif isinstance(value, timedelta):
             cell = DurationCell(row, col, value)
         else:
             raise ValueError("Can't determine cell type from type " + type(value).__name__)
@@ -882,7 +877,6 @@ class Cell(CellStorageFlags, Cacheable):
             offset += 4
         # Skip unused flags
         offset += 4 * bin(flags & 0x900).count("1")
-        #
         if flags & 0x2000:
             storage_flags._num_format_id = unpack("<i", buffer[offset : offset + 4])[0]
             offset += 4
@@ -916,12 +910,12 @@ class Cell(CellStorageFlags, Cacheable):
         elif cell_type == TSTArchives.textCellType:
             cell = TextCell(row, col, model.table_string(table_id, storage_flags._string_id))
         elif cell_type == TSTArchives.dateCellType:
-            cell = DateCell(row, col, EPOCH + duration(seconds=seconds))
+            cell = DateCell(row, col, EPOCH + timedelta(seconds=seconds))
             cell._datetime = cell._value
         elif cell_type == TSTArchives.boolCellType:
             cell = BoolCell(row, col, double > 0.0)
         elif cell_type == TSTArchives.durationCellType:
-            cell = DurationCell(row, col, duration(seconds=double))
+            cell = DurationCell(row, col, timedelta(seconds=double))
         elif cell_type == TSTArchives.formulaErrorCellType:
             cell = ErrorCell(row, col)
         elif cell_type == TSTArchives.automaticCellType:
@@ -1024,7 +1018,11 @@ class Cell(CellStorageFlags, Cacheable):
             flags = 4
             length += 8
             cell_type = TSTArchives.dateCellType
-            date_delta = self._value.astimezone() - EPOCH
+            # date_delta = self._value.astimezone() - EPOCH
+            if self._value.tzinfo is None:
+                date_delta = self._value - EPOCH
+            else:
+                date_delta = self._value - EPOCH.astimezone(self._value.tzinfo)
             value = pack("<d", float(date_delta.total_seconds()))
         elif isinstance(self, BoolCell):
             flags = 2
@@ -1483,7 +1481,7 @@ class DateCell(Cell):
           Do not instantiate directly. Cells are created by :py:class:`~numbers_parser.Document`.
     """  # fmt: skip
 
-    def __init__(self, row: int, col: int, value: DateTime) -> None:
+    def __init__(self, row: int, col: int, value: datetime) -> None:
         super().__init__(row, col, value)
         self._type = CellType.DATE
 
@@ -1493,12 +1491,12 @@ class DateCell(Cell):
 
 
 class DurationCell(Cell):
-    def __init__(self, row: int, col: int, value: Duration) -> None:
+    def __init__(self, row: int, col: int, value: timedelta) -> None:
         super().__init__(row, col, value)
         self._type = CellType.DURATION
 
     @property
-    def value(self) -> duration:
+    def value(self) -> timedelta:
         return self._value
 
 
@@ -1734,7 +1732,7 @@ def _decode_number_format(format, value, name):  # noqa: PLR0912
         int_width = num_integers
 
     # value_1 = str(value).split(".")[0]
-    # value_2 = sigfig.round(str(value).split(".")[1], sigfig=MAX_SIGNIFICANT_DIGITS, warn=False)
+    # value_2 = sigfig(str(value).split(".")[1], sigfig=MAX_SIGNIFICANT_DIGITS, warn=False)
     # int_pad_space_as_zero = (
     #     num_integers > 0
     #     and num_decimals > 0
@@ -1812,16 +1810,16 @@ def _format_decimal(value: float, format, percent: bool = False) -> str:
         formatted_value = f"{int(value):{thousands}}"
     else:
         if format.decimal_places >= DECIMAL_PLACES_AUTO:
-            formatted_value = str(sigfig.round(value, MAX_SIGNIFICANT_DIGITS, warn=False))
+            formatted_value = str(sigfig(value, MAX_SIGNIFICANT_DIGITS, warn=False))
         else:
-            formatted_value = sigfig.round(value, MAX_SIGNIFICANT_DIGITS, type=str, warn=False)
-            formatted_value = sigfig.round(
+            formatted_value = sigfig(value, MAX_SIGNIFICANT_DIGITS, type=str, warn=False)
+            formatted_value = sigfig(
                 formatted_value,
                 decimals=format.decimal_places,
                 type=str,
             )
         if format.show_thousands_separator:
-            formatted_value = sigfig.round(formatted_value, spacer=",", spacing=3, type=str)
+            formatted_value = sigfig(formatted_value, spacer=",", spacing=3, type=str)
             try:
                 (integer, decimal) = formatted_value.split(".")
                 formatted_value = integer + "." + decimal.replace(",", "")
@@ -1945,7 +1943,7 @@ def _format_fraction(value: float, format) -> str:
 
 
 def _format_scientific(value: float, format) -> str:
-    formatted_value = sigfig.round(value, sigfigs=MAX_SIGNIFICANT_DIGITS, warn=False)
+    formatted_value = sigfig(value, sigfigs=MAX_SIGNIFICANT_DIGITS, warn=False)
     return f"{formatted_value:.{format.decimal_places}E}"
 
 
@@ -1992,8 +1990,7 @@ def _auto_units(cell_value, format):
             unit_smallest = DurationUnits.HOUR
         elif cell_value % SECONDS_IN_WEEK:
             unit_smallest = DurationUnits.DAY
-        if unit_smallest < unit_largest:
-            unit_smallest = unit_largest
+        unit_smallest = max(unit_smallest, unit_largest)
 
     return unit_smallest, unit_largest
 

{numbers_parser-4.13.2 → numbers_parser-4.14.1}/src/numbers_parser/constants.py

@@ -1,8 +1,9 @@
 from collections import OrderedDict
+from datetime import datetime
 from enum import IntEnum
+from math import ceil
 
 import enum_tools.documentation
-from pendulum import datetime
 
 try:
     from importlib.resources import files
@@ -99,6 +100,16 @@ def _days_occurred_in_month(value: datetime) -> str:
     return str(n_days)
 
 
+def _day_of_year(value: datetime) -> int:
+    """Return the day number in a year for a datetime."""
+    return value.timetuple().tm_yday
+
+
+def _week_of_month(value: datetime) -> int:
+    """Return the week number in a month for a datetime."""
+    return int(ceil((value.day + value.replace(day=1).weekday()) / 7.0))
+
+
 DATETIME_FIELD_MAP = OrderedDict(
     [
         ("a", lambda x: x.strftime("%p").lower()),
@@ -113,9 +124,9 @@ DATETIME_FIELD_MAP = OrderedDict(
         ("M", "%-m"),
         ("d", "%-d"),
         ("dd", "%d"),
-        ("DDD", lambda x: str(x.day_of_year).zfill(3)),
-        ("DD", lambda x: str(x.day_of_year).zfill(2)),
-        ("D", lambda x: str(x.day_of_year).zfill(1)),
+        ("DDD", lambda x: str(_day_of_year(x)).zfill(3)),
+        ("DD", lambda x: str(_day_of_year(x)).zfill(2)),
+        ("D", lambda x: str(_day_of_year(x)).zfill(1)),
         ("HH", "%H"),
         ("H", "%-H"),
         ("hh", "%I"),
@@ -128,7 +139,7 @@ DATETIME_FIELD_MAP = OrderedDict(
         ("m", lambda x: str(x.minute)),
         ("ss", "%S"),
         ("s", lambda x: str(x.second)),
-        ("W", lambda x: str(x.week_of_month - 1)),
+        ("W", lambda x: str(_week_of_month(x) - 1)),
         ("ww", "%W"),
         ("G", "AD"),  # TODO: support BC
         ("F", lambda x: _days_occurred_in_month(x)),

{numbers_parser-4.13.2 → numbers_parser-4.14.1}/src/numbers_parser/document.py

@@ -1,9 +1,8 @@
+from datetime import datetime, timedelta
 from pathlib import Path
 from typing import Dict, Iterator, List, Optional, Tuple, Union
 from warnings import warn
 
-from pendulum import DateTime, Duration
-
 from numbers_parser.cell import (
     BackgroundImage,
     Border,
@@ -951,7 +950,7 @@ class Table(Cacheable):
         self,
         num_rows: Optional[int] = 1,
         start_row: Optional[Union[int, None]] = None,
-        default: Optional[Union[str, int, float, bool, DateTime, Duration]] = None,
+        default: Optional[Union[str, int, float, bool, datetime, timedelta]] = None,
     ) -> None:
         """Add or insert rows to the table.
 
@@ -1013,7 +1012,7 @@ class Table(Cacheable):
         self,
         num_cols: Optional[int] = 1,
         start_col: Optional[Union[int, None]] = None,
-        default: Optional[Union[str, int, float, bool, DateTime, Duration]] = None,
+        default: Optional[Union[str, int, float, bool, datetime, timedelta]] = None,
     ) -> None:
         """Add or insert columns to the table.
 

{numbers_parser-4.13.2 → numbers_parser-4.14.1}/src/numbers_parser/formula.py

@@ -1,7 +1,6 @@
 import re
 import warnings
-
-from pendulum import datetime, duration
+from datetime import datetime, timedelta
 
 from numbers_parser.exceptions import UnsupportedWarning
 from numbers_parser.generated import TSCEArchives_pb2 as TSCEArchives
@@ -68,7 +67,7 @@ class Formula(list):
     def date(self, *args):
         # Date literals exported as DATE()
         node = args[2]
-        dt = datetime(2001, 1, 1) + duration(seconds=node.AST_date_node_dateNum)
+        dt = datetime(2001, 1, 1) + timedelta(seconds=node.AST_date_node_dateNum)
         self.push(f"DATE({dt.year},{dt.month},{dt.day})")
 
     def div(self, *args):

numbers_parser-4.14.1/src/numbers_parser/roman.py

@@ -0,0 +1,18 @@
+def to_roman(value: int) -> str:
+    """Convert an integer to a Roman number in the available range of values."""
+    if value == 0:
+        return "N"
+
+    if value < 1 or value > 3999:
+        raise ValueError("Number out of range for Roman numerals")
+
+    int_values = [1000, 900, 500, 400, 100, 90, 50, 40, 10, 9, 5, 4, 1]
+    roman_symbols = ["M", "CM", "D", "CD", "C", "XC", "L", "XL", "X", "IX", "V", "IV", "I"]
+
+    roman_num = ""
+    for i in range(len(int_values)):
+        while value >= int_values[i]:
+            roman_num += roman_symbols[i]
+            value -= int_values[i]
+
+    return roman_num

{numbers_parser-4.13.2 → numbers_parser-4.14.1}/src/numbers_parser/generated/functionmap.py

@@ -15,11 +15,6 @@ FUNCTION_MAP = {
     14: "AVEDEV",
     15: "AVERAGE",
     16: "AVERAGEA",
-    330: "BITAND",
-    333: "BITLSHIFT",
-    334: "BITRSHIFT",
-    331: "BITOR",
-    332: "BITXOR",
     17: "CEILING",
     18: "CHAR",
     19: "CHOOSE",
@@ -28,7 +23,6 @@ FUNCTION_MAP = {
     22: "COLUMN",
     23: "COLUMNS",
     24: "COMBIN",
-    329: "CONCAT",
     25: "CONCATENATE",
     26: "CONFIDENCE",
     27: "CORREL",
@@ -77,7 +71,6 @@ FUNCTION_MAP = {
     70: "ISERROR",
     71: "ISEVEN",
     72: "ISODD",
-    335: "ISOWEEKNUM",
     73: "ISPMT",
     74: "LARGE",
     75: "LCM",
@@ -153,7 +146,6 @@ FUNCTION_MAP = {
     145: "SUMIF",
     146: "SUMPRODUCT",
     147: "SUMSQ",
-    336: "SWITCH",
     148: "SYD",
     149: "T",
     150: "TAN",
@@ -314,4 +306,12 @@ FUNCTION_MAP = {
     324: "REGEX.EXTRACT",
     325: "GETPIVOTDATA",
     328: "TEXTJOIN",
+    329: "CONCAT",
+    330: "BITAND",
+    331: "BITOR",
+    332: "BITXOR",
+    333: "BITLSHIFT",
+    334: "BITRSHIFT",
+    335: "ISOWEEKNUM",
+    336: "SWITCH",
 }