Merge pull request #10 from MHoroszowski/feature/ruff-format-pass

style: ruff format pass over src and tests (no semantic changes)

Author: MHoroszowski

.github/workflows/ci.yml

@@ -35,7 +35,6 @@ jobs:
         run: ruff check src tests
       - name: ruff format check
         run: ruff format --check src tests
-        continue-on-error: true  # advisory until format pass is run repo-wide
 
   test:
     name: Test (Python ${{ matrix.python-version }})

src/pptx/chart/xmlwriter.py

@@ -140,7 +140,7 @@ def pt_xml(self, values):
         in the overall data point sequence of the chart and is started at
         *offset*.
         """
-        xml = (f'                <c:ptCount val="{len(values)}"/>\n')
+        xml = f'                <c:ptCount val="{len(values)}"/>\n'
 
         pt_tmpl = (
             '                <c:pt idx="{idx}">\n'
@@ -861,9 +861,7 @@ def _marker_xml(self):
         no_marker_types = (XL.LINE, XL.LINE_STACKED, XL.LINE_STACKED_100)
         if self._chart_type in no_marker_types:
             return (
-                "          <c:marker>\n"
-                '            <c:symbol val="none"/>\n'
-                "          </c:marker>\n"
+                '          <c:marker>\n            <c:symbol val="none"/>\n          </c:marker>\n'
             )
         return ""
 
@@ -1053,9 +1051,7 @@ def xml(self):
     def _marker_xml(self):
         if self._chart_type == XL_CHART_TYPE.RADAR:
             return (
-                "          <c:marker>\n"
-                '            <c:symbol val="none"/>\n'
-                "          </c:marker>\n"
+                '          <c:marker>\n            <c:symbol val="none"/>\n          </c:marker>\n'
             )
         return ""
 
@@ -1178,9 +1174,7 @@ def _marker_xml(self):
         )
         if self._chart_type in no_marker_types:
             return (
-                "          <c:marker>\n"
-                '            <c:symbol val="none"/>\n'
-                "          </c:marker>\n"
+                '          <c:marker>\n            <c:symbol val="none"/>\n          </c:marker>\n'
             )
         return ""
 
@@ -1552,7 +1546,7 @@ def lvl_pt_xml(level):
 
         xml = ""
         for level in categories.levels:
-            xml += ("                <c:lvl>\n" "{lvl_pt_xml}" "                </c:lvl>\n").format(
+            xml += ("                <c:lvl>\n{lvl_pt_xml}                </c:lvl>\n").format(
                 **{"lvl_pt_xml": lvl_pt_xml(level)}
             )
         return xml
@@ -1712,15 +1706,15 @@ def _xVal_tmpl(self):
         The template for the ``<c:xVal>`` element for this series, containing
         the X values and their spreadsheet range reference.
         """
-        return "          <c:xVal{nsdecls}>\n" "{numRef_xml}" "          </c:xVal>\n"
+        return "          <c:xVal{nsdecls}>\n{numRef_xml}          </c:xVal>\n"
 
     @property
     def _yVal_tmpl(self):
         """
         The template for the ``<c:yVal>`` element for this series, containing
         the Y values and their spreadsheet range reference.
         """
-        return "          <c:yVal{nsdecls}>\n" "{numRef_xml}" "          </c:yVal>\n"
+        return "          <c:yVal{nsdecls}>\n{numRef_xml}          </c:yVal>\n"
 
 
 class _BubbleSeriesXmlWriter(_XySeriesXmlWriter):
@@ -1772,7 +1766,7 @@ def _bubbleSize_tmpl(self):
         containing the bubble size values and their spreadsheet range
         reference.
         """
-        return "          <c:bubbleSize{nsdecls}>\n" "{numRef_xml}" "          </c:bubbleSize>\n"
+        return "          <c:bubbleSize{nsdecls}>\n{numRef_xml}          </c:bubbleSize>\n"
 
 
 class _BubbleSeriesXmlRewriter(_BaseSeriesXmlRewriter):

src/pptx/custom_properties.py

@@ -114,9 +114,7 @@ def set_bool(self, name: str, value: bool) -> None:
     def set_datetime(self, name: str, value: dt.datetime) -> None:
         """Write `value` as `<vt:filetime>` (UTC, ISO-8601)."""
         if not isinstance(value, dt.datetime):  # pyright: ignore[reportUnnecessaryIsInstance]
-            raise TypeError(
-                "set_datetime value must be datetime, got %s" % type(value).__name__
-            )
+            raise TypeError("set_datetime value must be datetime, got %s" % type(value).__name__)
         self._set_typed(name, value)
 
     def _set_typed(self, name: str, value: CustomPropertyValue) -> None:

src/pptx/custom_xml.py

@@ -72,9 +72,7 @@ def __getitem__(self, key):  # type: ignore[override]
                 if partname == key or partname.endswith("/" + key):
                     return part
             raise KeyError("no custom_xml part with partname %r" % key)
-        raise TypeError(
-            "custom_xml_parts key must be int or str, got %s" % type(key).__name__
-        )
+        raise TypeError("custom_xml_parts key must be int or str, got %s" % type(key).__name__)
 
     # -- Public lookups ----------------------------------------------------
 
@@ -127,9 +125,7 @@ def add(
         `prs.save(...)`.
         """
         if scope not in ("presentation", "package"):
-            raise ValueError(
-                "scope must be 'presentation' or 'package', got %r" % (scope,)
-            )
+            raise ValueError("scope must be 'presentation' or 'package', got %r" % (scope,))
 
         package = self._presentation_part.package
         data_part = CustomXmlPart.new_pair(
@@ -182,9 +178,7 @@ def add_string_blob(
         if not isinstance(content, str):  # pyright: ignore[reportUnnecessaryIsInstance]
             raise TypeError("content must be str, got %s" % type(content).__name__)
         if encoding not in ("text", "base64"):
-            raise ValueError(
-                "encoding must be 'text' or 'base64', got %r" % (encoding,)
-            )
+            raise ValueError("encoding must be 'text' or 'base64', got %r" % (encoding,))
 
         from lxml import etree
 
@@ -288,9 +282,7 @@ def _iter_rel_collections(self):
         yield self._presentation_part.rels
         yield self._presentation_part.package._rels
 
-    def _resolve(
-        self, part: Union[CustomXmlPart, int, str]
-    ) -> CustomXmlPart | None:
+    def _resolve(self, part: Union[CustomXmlPart, int, str]) -> CustomXmlPart | None:
         if isinstance(part, CustomXmlPart):
             return part
         if isinstance(part, int):
@@ -304,8 +296,7 @@ def _resolve(
             except KeyError:
                 return None
         raise TypeError(
-            "remove() argument must be CustomXmlPart, int, or str; got %s"
-            % type(part).__name__
+            "remove() argument must be CustomXmlPart, int, or str; got %s" % type(part).__name__
         )
 
 

src/pptx/dml/color.py

@@ -101,8 +101,7 @@ def _validate_brightness_value(self, value):
             raise ValueError("brightness must be number in range -1.0 to 1.0")
         if isinstance(self._color, _NoneColor):
             msg = (
-                "can't set brightness when color.type is None. Set color.rgb"
-                " or .theme_color first."
+                "can't set brightness when color.type is None. Set color.rgb or .theme_color first."
             )
             raise ValueError(msg)
 

src/pptx/dml/fill.py

@@ -196,7 +196,7 @@ def back_color(self):
     @property
     def fore_color(self):
         """Raise TypeError for types that do not override this property."""
-        tmpl = "fill type %s has no foreground color, call .solid() or .pattern" "ed() first"
+        tmpl = "fill type %s has no foreground color, call .solid() or .patterned() first"
         raise TypeError(tmpl % self.__class__.__name__)
 
     @property

src/pptx/dml/line.py

@@ -200,8 +200,11 @@ def join_style(self) -> MSO_LINE_JOIN_STYLE | None:
         if join is None:
             return None
         tag_name = join.tag.split("}")[-1]
-        return {"round": MSO_LINE_JOIN_STYLE.ROUND, "bevel": MSO_LINE_JOIN_STYLE.BEVEL,
-                "miter": MSO_LINE_JOIN_STYLE.MITER}[tag_name]
+        return {
+            "round": MSO_LINE_JOIN_STYLE.ROUND,
+            "bevel": MSO_LINE_JOIN_STYLE.BEVEL,
+            "miter": MSO_LINE_JOIN_STYLE.MITER,
+        }[tag_name]
 
     @join_style.setter
     def join_style(self, value: MSO_LINE_JOIN_STYLE | None) -> None:

src/pptx/enum/text.py

@@ -288,22 +288,14 @@ class PP_AUTO_NUMBER_STYLE(BaseXmlEnum):
     ALPHA_LC_PERIOD = (8, "alphaLcPeriod", "Lowercase letters with period: a. b. c.")
     """Lowercase letters with period: a. b. c."""
 
-    ALPHA_UC_PAREN_RIGHT = (
-        9, "alphaUcParenR", "Uppercase letters with parenthesis: A) B) C)"
-    )
+    ALPHA_UC_PAREN_RIGHT = (9, "alphaUcParenR", "Uppercase letters with parenthesis: A) B) C)")
     """Uppercase letters with parenthesis: A) B) C)"""
 
-    ALPHA_LC_PAREN_RIGHT = (
-        10, "alphaLcParenR", "Lowercase letters with parenthesis: a) b) c)"
-    )
+    ALPHA_LC_PAREN_RIGHT = (10, "alphaLcParenR", "Lowercase letters with parenthesis: a) b) c)")
     """Lowercase letters with parenthesis: a) b) c)"""
 
-    ALPHA_UC_PAREN_BOTH = (
-        11, "alphaUcParenBoth", "Uppercase letters in parentheses: (A) (B) (C)"
-    )
+    ALPHA_UC_PAREN_BOTH = (11, "alphaUcParenBoth", "Uppercase letters in parentheses: (A) (B) (C)")
     """Uppercase letters in parentheses: (A) (B) (C)"""
 
-    ALPHA_LC_PAREN_BOTH = (
-        12, "alphaLcParenBoth", "Lowercase letters in parentheses: (a) (b) (c)"
-    )
+    ALPHA_LC_PAREN_BOTH = (12, "alphaLcParenBoth", "Lowercase letters in parentheses: (a) (b) (c)")
     """Lowercase letters in parentheses: (a) (b) (c)"""

src/pptx/opc/constants.py

@@ -199,8 +199,7 @@ class RELATIONSHIP_TYPE:
     A_F_CHUNK = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/aFChunk"
     CALC_CHAIN = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/calcChain"
     CERTIFICATE = (
-        "http://schemas.openxmlformats.org/package/2006/relationships/digital-signatu"
-        "re/certificate"
+        "http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/certificate"
     )
     CHART = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart"
     CHARTSHEET = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chartsheet"
@@ -270,8 +269,7 @@ class RELATIONSHIP_TYPE:
     ORIGIN = "http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/origin"
     PACKAGE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"
     PIVOT_CACHE_DEFINITION = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCac"
-        "heDefinition"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition"
     )
     PIVOT_CACHE_RECORDS = (
         "http://schemas.openxmlformats.org/officeDocument/2006/relationships/spreadsh"
@@ -295,8 +293,7 @@ class RELATIONSHIP_TYPE:
         "http://schemas.openxmlformats.org/officeDocument/2006/relationships/sheetMetadata"
     )
     SIGNATURE = (
-        "http://schemas.openxmlformats.org/package/2006/relationships/digital-signatu"
-        "re/signature"
+        "http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/signature"
     )
     SLIDE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide"
     SLIDE_LAYOUT = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout"
@@ -321,8 +318,7 @@ class RELATIONSHIP_TYPE:
     VIEW_PROPS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/viewProps"
     VML_DRAWING = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing"
     VOLATILE_DEPENDENCIES = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/volatile"
-        "Dependencies"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/volatileDependencies"
     )
     WEB_SETTINGS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings"
     WORKSHEET_SOURCE = (

src/pptx/opc/package.py

@@ -727,8 +727,7 @@ def target_part(self) -> Part:
         """|Part| or subtype referred to by this relationship."""
         if self.is_external:
             raise ValueError(
-                "`.target_part` property on _Relationship is undefined when "
-                "target-mode is external"
+                "`.target_part` property on _Relationship is undefined when target-mode is external"
             )
         assert isinstance(self._target, Part)
         return self._target