pyOfficeEditor 0.2.0__tar.gz → 0.2.2__tar.gz

{pyofficeeditor-0.2.0 → pyofficeeditor-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pyOfficeEditor
-Version: 0.2.0
+Version: 0.2.2
 Summary: Edit the document surface of Excel, Word, PowerPoint and Access in pure Python, no dependencies.
 Project-URL: Homepage, https://github.com/WilliamSmithEdward/pyOfficeEditor
 Project-URL: Repository, https://github.com/WilliamSmithEdward/pyOfficeEditor

{pyofficeeditor-0.2.0 → pyofficeeditor-0.2.2}/docs/changelog.md

@@ -11,7 +11,9 @@ package and writing it back unchanged reproduces the input exactly.
 workflow extracts one section by reading to the next "## [" heading, so
 anything trailing the file is swept into the oldest release's notes. -->
 
-[Unreleased]: https://github.com/WilliamSmithEdward/pyOfficeEditor/compare/v0.2.0...HEAD
+[Unreleased]: https://github.com/WilliamSmithEdward/pyOfficeEditor/compare/v0.2.2...HEAD
+[0.2.2]: https://github.com/WilliamSmithEdward/pyOfficeEditor/compare/v0.2.1...v0.2.2
+[0.2.1]: https://github.com/WilliamSmithEdward/pyOfficeEditor/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/WilliamSmithEdward/pyOfficeEditor/compare/v0.1.1...v0.2.0
 [0.1.1]: https://github.com/WilliamSmithEdward/pyOfficeEditor/compare/v0.1.0...v0.1.1
 [0.1.0]: https://github.com/WilliamSmithEdward/pyOfficeEditor/releases/tag/v0.1.0
@@ -20,6 +22,39 @@ anything trailing the file is swept into the oldest release's notes. -->
 
 Nothing yet.
 
+## [0.2.2] - 2026-09-20
+
+### Fixed
+
+- **`__version__` reported 0.1.0 on every release since.** It was a literal
+  in `__init__.py` that nothing linked to the version in
+  `pyproject.toml`, so 0.1.1, 0.2.0 and 0.2.1 all imported saying 0.1.0.
+  The distribution metadata was right throughout; only the attribute was
+  wrong, so `pip` and the PyPI page were never affected and anything
+  reading `pyofficeeditor.__version__` was.
+
+  It is read from the installed distribution now, which cannot drift, and
+  `tests/test_version.py` fails if the attribute, the metadata and
+  `pyproject.toml` ever disagree. That test is the thing that was missing:
+  nothing checked, so nothing failed.
+
+## [0.2.1] - 2026-09-19
+
+### Added
+
+- **The preset geometry each MsoAutoShapeType maps to**, and
+  `Shape.auto_shape_type` reporting it back, measured by having Excel make
+  one shape of each of 33 types and reading the drawing.
+
+  This is an addition rather than a fix: pyOfficeEditor never carried the
+  table. It is worth measuring rather than transcribing, because every
+  plausible wrong answer is a real preset name belonging to some other
+  shape. A table pairing 11 with `cross`, 12 with `star5`, 16 with `can`
+  and 17 with `cube` looks right and is wrong on all four: Excel writes
+  `plus`, `pentagon`, `foldedCorner` and `smileyFace`. Nothing complains,
+  the file is valid, and the wrong shape appears. The five-pointed star is
+  92, not 12.
+
 ## [0.2.0] - 2026-09-19
 
 Conditional formatting, data validation, sheet protection, page setup,

{pyofficeeditor-0.2.0 → pyofficeeditor-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pyOfficeEditor"
-version = "0.2.0"
+version = "0.2.2"
 description = "Edit the document surface of Excel, Word, PowerPoint and Access in pure Python, no dependencies."
 readme = "README.md"
 license = { text = "MIT" }

{pyofficeeditor-0.2.0 → pyofficeeditor-0.2.2}/src/pyofficeeditor/__init__.py

@@ -19,6 +19,8 @@ Access follow in that order.
 
 from __future__ import annotations
 
+from importlib.metadata import PackageNotFoundError, version
+
 from pyofficeeditor._xml import Element, XmlDocument
 from pyofficeeditor.exceptions import (
     PackageError,
@@ -29,7 +31,19 @@ from pyofficeeditor.exceptions import (
 )
 from pyofficeeditor.opc import OpcPackage, Relationship, Relationships
 
-__version__ = "0.1.0"
+try:
+    #: Read from the installed distribution rather than written here.
+    #:
+    #: A literal has to be remembered at every release and was not: 0.1.1,
+    #: 0.2.0 and 0.2.1 all shipped saying 0.1.0, because nothing links a
+    #: string in this file to the version in pyproject.toml. Asking the
+    #: metadata cannot drift, and ``tests/test_version.py`` fails if the
+    #: two ever disagree.
+    __version__ = version("pyOfficeEditor")
+except PackageNotFoundError:  # pragma: no cover - a source tree, uninstalled
+    # Importable straight from a checkout, where there is no distribution to
+    # ask. Saying so beats guessing a number.
+    __version__ = "0.0.0+source"
 
 __all__ = [
     "Element",

{pyofficeeditor-0.2.0 → pyofficeeditor-0.2.2}/src/pyofficeeditor/excel/_shapes.py

@@ -97,6 +97,63 @@ _ELEMENT_KINDS: dict[str, ShapeKind] = {
     "graphicFrame": "chart",
 }
 
+
+#: The preset geometry Excel writes for each ``MsoAutoShapeType``, measured
+#: by making one shape of each and reading the drawing back.
+#:
+#: Worth measuring rather than transcribing, because every plausible wrong
+#: answer here is a real preset name belonging to some other shape. A table
+#: that pairs 11 with ``cross``, 12 with ``star5``, 16 with ``can`` and 17
+#: with ``cube`` looks right and is wrong on all four: Excel writes ``plus``,
+#: ``pentagon``, ``foldedCorner`` and ``smileyFace``. Nothing complains. The
+#: file is valid and the wrong shape appears.
+#:
+#: The five-pointed star is 92, not 12. The numbers are not contiguous:
+#: ``MsoAutoShapeType`` leaves gaps, and only the ones Excel actually made
+#: when asked are here.
+PRESET_GEOMETRY: dict[int, str] = {
+    1: "rect",  # msoShapeRectangle
+    2: "parallelogram",
+    3: "trapezoid",
+    4: "diamond",
+    5: "roundRect",  # msoShapeRoundedRectangle
+    6: "octagon",
+    7: "triangle",  # msoShapeIsoscelesTriangle
+    8: "rtTriangle",
+    9: "ellipse",  # msoShapeOval
+    10: "hexagon",
+    11: "plus",  # msoShapeCross
+    12: "pentagon",  # msoShapeRegularPentagon
+    13: "can",
+    14: "cube",
+    15: "bevel",
+    16: "foldedCorner",
+    17: "smileyFace",
+    18: "donut",
+    19: "noSmoking",
+    20: "blockArc",
+    21: "heart",
+    22: "lightningBolt",
+    23: "sun",
+    24: "moon",
+    25: "arc",
+    26: "bracketPair",
+    27: "bracePair",
+    28: "plaque",
+    92: "star5",  # msoShape5pointStar
+    93: "star8",
+    94: "star16",
+    95: "star24",
+    96: "star32",
+}
+
+#: The same the other way round, for reporting what a shape read from a
+#: file would answer for ``AutoShapeType``.
+AUTO_SHAPE_TYPES: dict[str, int] = {
+    preset: number for number, preset in PRESET_GEOMETRY.items()
+}
+
+
 #: The anchors a drawing is made of.
 ANCHORS = ("twoCellAnchor", "oneCellAnchor", "absoluteAnchor")
 
@@ -221,6 +278,16 @@ class Shape:
         """What ``Shape.Type`` answers for this kind."""
         return MSO_TYPE.get(self.kind, 1)
 
+    @property
+    def auto_shape_type(self) -> int | None:
+        """What ``Shape.AutoShapeType`` answers, or ``None`` for a geometry
+        this does not name.
+
+        A text box answers 1 as well as an AutoShape does, which is what
+        Excel reports, because both are drawn as a rectangle.
+        """
+        return AUTO_SHAPE_TYPES.get(self.geometry)
+
     def __repr__(self) -> str:
         where = f"{self.left:g},{self.top:g} {self.width:g}x{self.height:g}"
         macro = f" macro={self.macro}" if self.macro else ""
@@ -470,10 +537,12 @@ def _as_float(raw: str | None, fallback: float) -> float:
 
 __all__ = [
     "ANCHORS",
+    "AUTO_SHAPE_TYPES",
     "DEFAULT_COLUMN_POINTS",
     "DEFAULT_ROW_POINTS",
     "EMU_PER_POINT",
     "MSO_TYPE",
+    "PRESET_GEOMETRY",
     "Shape",
     "ShapeKind",
     "SheetGrid",