Update tests

python · Avasam · Jan 10, 2023 · Jan 11, 2023 · Jan 12, 2023 · Jan 12, 2023
commit dd5a1525b008fe8fb905a343c6713f39d1e1ff74
diff --git a/stubs/openpyxl/@tests/stubtest_allowlist.txt b/stubs/openpyxl/@tests/stubtest_allowlist.txt
@@ -4,6 +4,8 @@ openpyxl.descriptors.slots.AutoSlotProperties.__new__
 # The actual runtime definition depends on what else is installed
 # (lxml, defusedxml, et_xmlfile, numpy, ...)
 openpyxl.compat.NUMERIC_TYPES
+openpyxl.compat.numbers.NUMERIC_TYPES
+openpyxl.cell.cell.NUMERIC_TYPES
 openpyxl.xml._functions
 openpyxl.xml.functions.Element.__iter__
 openpyxl.xml.functions.tostring
@@ -28,184 +30,14 @@ openpyxl.utils.cell.col
 openpyxl.utils.cell.i
 
 # Unintended re-exports
-openpyxl.cell._writer.LXML
-openpyxl.cell._writer.REL_NS
-openpyxl.cell._writer.XML_NS
-openpyxl.cell.cell.NUMERIC_TYPES
-openpyxl.cell.read_only.BUILTIN_FORMATS
-openpyxl.cell.read_only.BUILTIN_FORMATS_MAX_SIZE
-openpyxl.chart._chart.attribute_mapping
-openpyxl.chart.axis.CHART_NS
-openpyxl.chart.chartspace.CHART_NS
 openpyxl.chart.marker.DRAWING_NS
 openpyxl.chart.marker.PRESET_COLORS
 openpyxl.chart.shapes.DRAWING_NS
 openpyxl.chart.shapes.PRESET_COLORS
-openpyxl.chartsheet.chartsheet.REL_NS
-openpyxl.chartsheet.chartsheet.SHEET_MAIN_NS
-openpyxl.comments.comment_sheet.SHEET_MAIN_NS
-openpyxl.comments.comment_sheet.tostring
-openpyxl.comments.shape_writer.tostring
-openpyxl.compat.numbers.NUMERIC_TYPES
-openpyxl.compat.strings.NUMERIC_TYPES
-openpyxl.descriptors.excel.REL_NS
-openpyxl.descriptors.serialisable.kwlist
-openpyxl.drawing.colors.DRAWING_NS
-openpyxl.drawing.drawing.BLACK
-openpyxl.drawing.drawing.WHITE
-openpyxl.drawing.fill.DRAWING_NS
-openpyxl.drawing.fill.PRESET_COLORS
-openpyxl.drawing.geometry.DRAWING_NS
-openpyxl.drawing.graphic.CHART_NS
-openpyxl.drawing.graphic.DRAWING_NS
-openpyxl.drawing.graphic.NS_REGEX
-openpyxl.drawing.graphic.REL_NS
-openpyxl.drawing.line.DRAWING_NS
-openpyxl.drawing.picture.DRAWING_NS
-openpyxl.drawing.properties.DRAWING_NS
-openpyxl.drawing.relation.CHART_NS
-openpyxl.drawing.spreadsheet_drawing.SHEET_DRAWING_NS
-openpyxl.drawing.text.DRAWING_NS
 openpyxl.drawing.text.PRESET_COLORS
-openpyxl.formatting.rule.COORD_RE
-openpyxl.packaging.core.COREPROPS_NS
-openpyxl.packaging.core.DCORE_NS
-openpyxl.packaging.core.DCTERMS_NS
-openpyxl.packaging.core.DCTERMS_PREFIX
-openpyxl.packaging.core.tostring
-openpyxl.packaging.core.XSI_NS
-openpyxl.packaging.extended.XPROPS_NS
-openpyxl.packaging.manifest.ACTIVEX
-openpyxl.packaging.manifest.ARC_APP
-openpyxl.packaging.manifest.ARC_CONTENT_TYPES
-openpyxl.packaging.manifest.ARC_CORE
-openpyxl.packaging.manifest.ARC_SHARED_STRINGS
-openpyxl.packaging.manifest.ARC_STYLE
-openpyxl.packaging.manifest.ARC_THEME
 openpyxl.packaging.manifest.ARC_WORKBOOK
-openpyxl.packaging.manifest.CHART_TYPE
-openpyxl.packaging.manifest.CHARTSHAPE_TYPE
-openpyxl.packaging.manifest.CHARTSHEET_TYPE
-openpyxl.packaging.manifest.COMMENTS_TYPE
-openpyxl.packaging.manifest.CONTYPES_NS
-openpyxl.packaging.manifest.CTRL
-openpyxl.packaging.manifest.DRAWING_TYPE
-openpyxl.packaging.manifest.EXTERNAL_LINK
-openpyxl.packaging.manifest.SHARED_STRINGS
-openpyxl.packaging.manifest.STYLES_TYPE
-openpyxl.packaging.manifest.THEME_TYPE
-openpyxl.packaging.manifest.tostring
-openpyxl.packaging.manifest.VBA
-openpyxl.packaging.manifest.WORKSHEET_TYPE
-openpyxl.packaging.manifest.XLSM
-openpyxl.packaging.manifest.XLSX
-openpyxl.packaging.manifest.XLTM
-openpyxl.packaging.manifest.XLTX
-openpyxl.packaging.relationship.PKG_REL_NS
-openpyxl.packaging.relationship.REL_NS
-openpyxl.packaging.relationship.tostring
-openpyxl.packaging.workbook.SHEET_MAIN_NS
-openpyxl.pivot.cache.SHEET_MAIN_NS
-openpyxl.pivot.cache.tostring
-openpyxl.pivot.record.SHEET_MAIN_NS
-openpyxl.pivot.record.tostring
-openpyxl.pivot.table.SHEET_MAIN_NS
-openpyxl.pivot.table.tostring
-openpyxl.reader.drawings.IMAGE_NS
-openpyxl.reader.drawings.PILImage
-openpyxl.reader.excel.ARC_CONTENT_TYPES
-openpyxl.reader.excel.ARC_CORE
-openpyxl.reader.excel.ARC_SHARED_STRINGS
-openpyxl.reader.excel.ARC_THEME
-openpyxl.reader.excel.ARC_WORKBOOK
-openpyxl.reader.excel.COMMENTS_NS
-openpyxl.reader.excel.EXTERNAL_LINK
-openpyxl.reader.excel.KEEP_VBA
-openpyxl.reader.excel.SHARED_STRINGS
-openpyxl.reader.excel.XLSM
-openpyxl.reader.excel.XLSX
-openpyxl.reader.excel.XLTM
-openpyxl.reader.excel.XLTX
-openpyxl.reader.excel.ZIP_DEFLATED
-openpyxl.reader.strings.SHEET_MAIN_NS
-openpyxl.reader.workbook.CALENDAR_MAC_1904
-openpyxl.styles.fills.SHEET_MAIN_NS
-openpyxl.styles.fonts.BLACK
-openpyxl.styles.fonts.SHEET_MAIN_NS
-openpyxl.styles.named_styles.BUILTIN_FORMATS_MAX_SIZE
-openpyxl.styles.named_styles.BUILTIN_FORMATS_REVERSE
-openpyxl.styles.styleable.BUILTIN_FORMATS
-openpyxl.styles.styleable.BUILTIN_FORMATS_MAX_SIZE
-openpyxl.styles.styleable.BUILTIN_FORMATS_REVERSE
-openpyxl.styles.styleable.styles
-openpyxl.styles.stylesheet.ARC_STYLE
-openpyxl.styles.stylesheet.BUILTIN_FORMATS
-openpyxl.styles.stylesheet.BUILTIN_FORMATS_MAX_SIZE
-openpyxl.styles.stylesheet.BUILTIN_FORMATS_REVERSE
-openpyxl.styles.stylesheet.COLOR_INDEX
-openpyxl.styles.stylesheet.SHEET_MAIN_NS
-openpyxl.styles.stylesheet.styles
-openpyxl.utils.cell.digits
-openpyxl.workbook._writer.ARC_APP
-openpyxl.workbook._writer.ARC_CORE
-openpyxl.workbook._writer.ARC_ROOT_RELS
-openpyxl.workbook._writer.ARC_WORKBOOK
-openpyxl.workbook._writer.CALENDAR_MAC_1904
-openpyxl.workbook._writer.CUSTOMUI_NS
-openpyxl.workbook._writer.PKG_REL_NS
-openpyxl.workbook._writer.tostring
-openpyxl.workbook.defined_name.SHEET_TITLE
-openpyxl.workbook.defined_name.SHEETRANGE_RE
-openpyxl.workbook.external_link.external.SHEET_MAIN_NS
-openpyxl.workbook.workbook.COLOR_INDEX
-openpyxl.workbook.workbook.MAC_EPOCH
-openpyxl.workbook.workbook.WINDOWS_EPOCH
-openpyxl.workbook.workbook.XLSM
-openpyxl.workbook.workbook.XLSX
-openpyxl.workbook.workbook.XLTM
-openpyxl.workbook.workbook.XLTX
-openpyxl.worksheet._reader.EXT_TYPES
-openpyxl.worksheet._reader.SHEET_MAIN_NS
-openpyxl.worksheet._reader.WINDOWS_EPOCH
-openpyxl.worksheet._writer.SHEET_MAIN_NS
-openpyxl.worksheet.dimensions.DEFAULT_COLUMN_WIDTH
-openpyxl.worksheet.ole.SHEET_DRAWING_NS
-openpyxl.worksheet.table.REL_NS
-openpyxl.worksheet.table.SHEET_MAIN_NS
-openpyxl.worksheet.table.tostring
-openpyxl.worksheet.worksheet.COL_RANGE_RE
-openpyxl.worksheet.worksheet.ROW_RANGE_RE
-openpyxl.writer.excel.ARC_APP
-openpyxl.writer.excel.ARC_CONTENT_TYPES
-openpyxl.writer.excel.ARC_CORE
-openpyxl.writer.excel.ARC_ROOT_RELS
-openpyxl.writer.excel.ARC_SHARED_STRINGS
-openpyxl.writer.excel.ARC_STYLE
-openpyxl.writer.excel.ARC_THEME
-openpyxl.writer.excel.ARC_WORKBOOK
-openpyxl.writer.excel.ARC_WORKBOOK_RELS
-openpyxl.writer.excel.PACKAGE_CHARTS
-openpyxl.writer.excel.PACKAGE_CHARTSHEETS
-openpyxl.writer.excel.PACKAGE_DRAWINGS
-openpyxl.writer.excel.PACKAGE_IMAGES
-openpyxl.writer.excel.PACKAGE_WORKSHEETS
-openpyxl.writer.excel.PACKAGE_XL
-openpyxl.writer.excel.theme_xml
-openpyxl.writer.excel.tostring
-openpyxl.writer.excel.ZIP_DEFLATED
-openpyxl.xml.functions.CHART_DRAWING_NS
-openpyxl.xml.functions.CHART_NS
-openpyxl.xml.functions.COREPROPS_NS
-openpyxl.xml.functions.DCTERMS_NS
-openpyxl.xml.functions.DCTERMS_PREFIX
-openpyxl.xml.functions.DEFUSEDXML
-openpyxl.xml.functions.DRAWING_NS
-openpyxl.xml.functions.LXML
-openpyxl.xml.functions.REL_NS
-openpyxl.xml.functions.SHEET_DRAWING_NS
-openpyxl.xml.functions.SHEET_MAIN_NS
-openpyxl.xml.functions.VTYPES_NS
-openpyxl.xml.functions.XML_NS
+
+# Type vs class stubtest issue
+openpyxl.chart.descriptors.NumberFormatDescriptor.expected_type
 
 # Variable differs from runtime type because attributes are actually
 # non-Convertible descriptors and the value is obtained through a dynamic getter

diff --git a/stubs/openpyxl/openpyxl/cell/cell.pyi b/stubs/openpyxl/openpyxl/cell/cell.pyi
@@ -16,10 +16,20 @@ TIME_FORMATS: dict[_TimeTypes, str]
 STRING_TYPES: tuple[type[str], type[bytes]]
 _StringTypes: TypeAlias = str | bytes
 # mypy will simplify the type. Pyright fully expands it.
-KNOWN_TYPES = NUMERIC_TYPES + TIME_TYPES + STRING_TYPES + (bool, type(None))  # noqa: F821,Y026
+KNOWN_TYPES = NUMERIC_TYPES + TIME_TYPES + STRING_TYPES + (bool, type(None))  # noqa: F821,Y015
 _KnownTypes: TypeAlias = _NumericTypes | _TimeTypes | _StringTypes | bool | None
 ILLEGAL_CHARACTERS_RE: Pattern[str]
-ERROR_CODES: Final = ("#NULL!", "#DIV/0!", "#VALUE!", "#REF!", "#NAME?", "#NUM!", "#N/A")
+ERROR_CODES: Final[
+    tuple[
+        Literal["#NULL!"],
+        Literal["#DIV/0!"],
+        Literal["#VALUE!"],
+        Literal["#REF!"],
+        Literal["#NAME?"],
+        Literal["#NUM!"],
+        Literal["#N/A"],
+    ]
+]
 TYPE_STRING: Final = "s"
 TYPE_FORMULA: Final = "f"
 TYPE_NUMERIC: Final = "n"
@@ -29,7 +39,11 @@ TYPE_INLINE: Final = "inlineStr"
 TYPE_ERROR: Final = "e"
 TYPE_FORMULA_CACHE_STRING: Final = "str"
 
-VALID_TYPES = (TYPE_STRING, TYPE_FORMULA, TYPE_NUMERIC, TYPE_BOOL, TYPE_NULL, TYPE_INLINE, TYPE_ERROR, TYPE_FORMULA_CACHE_STRING)
+VALID_TYPES: Final[
+    tuple[
+        Literal["s"], Literal["f"], Literal["n"], Literal["b"], Literal["n"], Literal["inlineStr"], Literal["e"], Literal["str"]
+    ]
+]
 
 def get_type(t, value) -> Literal["n", "s", "d", None]: ...
 def get_time_format(t) -> str: ...

diff --git a/stubs/openpyxl/openpyxl/reader/excel.pyi b/stubs/openpyxl/openpyxl/reader/excel.pyi
@@ -1,13 +1,13 @@
 from _typeshed import Incomplete, StrPath
 from typing import IO
-from typing_extensions import Final
+from typing_extensions import Final, Literal
 from zipfile import ZipFile
 
 from openpyxl.packaging.relationship import Relationship
 from openpyxl.packaging.workbook import ChildSheet
 from openpyxl.workbook.workbook import Workbook
 
-SUPPORTED_FORMATS: Final = (".xlsx", ".xlsm", ".xltx", ".xltm")
+SUPPORTED_FORMATS: Final[tuple[Literal[".xlsx"], Literal[".xlsm"], Literal[".xltx"], Literal[".xltm"]]]
 
 class ExcelReader:
     archive: ZipFile

diff --git a/stubs/openpyxl/openpyxl/styles/alignment.pyi b/stubs/openpyxl/openpyxl/styles/alignment.pyi
@@ -6,11 +6,22 @@ from openpyxl.descriptors.serialisable import Serialisable
 
 _Unused: TypeAlias = object
 
-horizontal_alignments: Final = ("general", "left", "center", "right", "fill", "justify", "centerContinuous", "distributed")
+horizontal_alignments: Final[
+    tuple[
+        Literal["general"],
+        Literal["left"],
+        Literal["center"],
+        Literal["right"],
+        Literal["fill"],
+        Literal["justify"],
+        Literal["centerContinuous"],
+        Literal["distributed"],
+    ]
+]
 _HorizontalAlignementsType: TypeAlias = Literal[
     "general", "left", "center", "right", "fill", "justify", "centerContinuous", "distributed"
 ]
-vertical_aligments: Final = ("top", "center", "bottom", "justify", "distributed")
+vertical_aligments: Final[tuple[Literal["top"], Literal["center"], Literal["bottom"], Literal["justify"], Literal["distributed"]]]
 _VerticalAlignementsType: TypeAlias = Literal["top", "center", "bottom", "justify", "distributed"]
 
 class Alignment(Serialisable):

diff --git a/stubs/openpyxl/openpyxl/styles/fills.pyi b/stubs/openpyxl/openpyxl/styles/fills.pyi
@@ -32,26 +32,28 @@ FILL_PATTERN_LIGHTUP: Final = "lightUp"
 FILL_PATTERN_LIGHTVERTICAL: Final = "lightVertical"
 FILL_PATTERN_MEDIUMGRAY: Final = "mediumGray"
 
-fills: Final = (
-    FILL_SOLID,
-    FILL_PATTERN_DARKDOWN,
-    FILL_PATTERN_DARKGRAY,
-    FILL_PATTERN_DARKGRID,
-    FILL_PATTERN_DARKHORIZONTAL,
-    FILL_PATTERN_DARKTRELLIS,
-    FILL_PATTERN_DARKUP,
-    FILL_PATTERN_DARKVERTICAL,
-    FILL_PATTERN_GRAY0625,
-    FILL_PATTERN_GRAY125,
-    FILL_PATTERN_LIGHTDOWN,
-    FILL_PATTERN_LIGHTGRAY,
-    FILL_PATTERN_LIGHTGRID,
-    FILL_PATTERN_LIGHTHORIZONTAL,
-    FILL_PATTERN_LIGHTTRELLIS,
-    FILL_PATTERN_LIGHTUP,
-    FILL_PATTERN_LIGHTVERTICAL,
-    FILL_PATTERN_MEDIUMGRAY,
-)
+fills: Final[
+    tuple[
+        Literal["solid"],
+        Literal["darkDown"],
+        Literal["darkGray"],
+        Literal["darkGrid"],
+        Literal["darkHorizontal"],
+        Literal["darkTrellis"],
+        Literal["darkUp"],
+        Literal["darkVertical"],
+        Literal["gray0625"],
+        Literal["gray125"],
+        Literal["lightDown"],
+        Literal["lightGray"],
+        Literal["lightGrid"],
+        Literal["lightHorizontal"],
+        Literal["lightTrellis"],
+        Literal["lightUp"],
+        Literal["lightVertical"],
+        Literal["mediumGray"],
+    ]
+]
 _FillsType: TypeAlias = Literal[
     "none",
     "solid",