Fix: Add py314, zip(required=true) for most

Author: clemens-fricke

.github/workflows/main.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         arch: [x86_64]
-        cw_build: ["cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*"]
+        cw_build: ["cp310-*", "cp311-*", "cp312-*", "cp313-*", "cp314-*"]
 
     steps:
     - uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
     strategy:
       matrix:
         arch: [arm64]
-        cw_build: ["cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*"]
+        cw_build: ["cp310-*", "cp311-*", "cp312-*", "cp313-*", "cp314-*"]
 
     steps:
     - uses: actions/checkout@v4
@@ -60,7 +60,7 @@ jobs:
     strategy:
       matrix:
         arch: [x86_64]
-        cw_build: ["cp39*many*", "cp310*many*", "cp311*many*", "cp312*many*", "cp313*many*"]
+        cw_build: ["cp310*many*", "cp311*many*", "cp312*many*", "cp313*many*", "cp314*many*"]
 
     steps:
     - uses: actions/checkout@v4
@@ -85,7 +85,7 @@ jobs:
     strategy:
       matrix:
         arch: [AMD64]
-        cw_build: ["cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*"]
+        cw_build: ["cp310-*", "cp311-*", "cp312-*", "cp313-*", "cp314-*"]
 
     steps:
     - uses: actions/checkout@v4

.github/workflows/test_full.yml

@@ -18,7 +18,7 @@ jobs:
       SPLINEPY_GITHUB_ACTIONS_BUILD: True
     strategy:
       matrix:
-        python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:

.pre-commit-config.yaml

@@ -24,6 +24,7 @@ repos:
   - id: check-yaml
   - id: debug-statements
   - id: end-of-file-fixer
+    exclude: '^tests/data/.*$'
   - id: mixed-line-ending
   - id: requirements-txt-fixer
   - id: trailing-whitespace

docs/source/handle_markdown.py

@@ -16,7 +16,6 @@
 import pathlib
 import re
 import warnings
-from typing import List, Tuple
 
 # Path to this file.
 file_path = os.path.abspath(os.path.dirname(__file__))
@@ -38,7 +37,7 @@ def get_markdown_links(line: str) -> str:
     return possible or ""
 
 
-def get_special_links(line: str) -> List[Tuple[str, str]]:
+def get_special_links(line: str) -> list[tuple[str, str]]:
     """Get the special links from a string.
 
     Args:

examples/show_readme.py

@@ -97,7 +97,7 @@
 para_queries = []
 phys_queries = []
 colors = ["red", "yellow", "blue"]
-for q, pc, c in zip(queries, physical_coordinates, colors):
+for q, pc, c in zip(queries, physical_coordinates, colors, strict=False):
     para_q, phys_q = gus.Vertices([q]), gus.Vertices([pc])
     para_q.show_options["c"] = c
     para_q.show_options["r"] = 10

pyproject.toml

@@ -15,11 +15,11 @@ classifiers=[
     "Development Status :: 4 - Beta",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Natural Language :: English",
     "Topic :: Scientific/Engineering",
 ]
@@ -91,7 +91,7 @@ lint.select = [
   "A",           # flake8-builtins
 ]
 lint.fixable = ["ALL"]
-target-version = "py38"
+target-version = "py312"
 lint.ignore = [
     "PLR2004", # TODO!
     "PLR0912", # Too many branches

splinepy/bspline.py

@@ -108,8 +108,7 @@ def insert_knots(self, parametric_dimension, knots):
 
         if min(knots) < min(self.knot_vectors[parametric_dimension]):
             raise ValueError(
-                "One of the query knots not in valid knot range. "
-                "(Too small)"
+                "One of the query knots not in valid knot range. (Too small)"
             )
 
         inserted = _splinepy_core.insert_knots(
@@ -171,7 +170,7 @@ def determine_new_knots(kv_unique, n_knots):
             return new_knots
 
         # determine new knots for each para_dim and insert the knots
-        for para_dim, n_k in zip(para_dims, n_knots):
+        for para_dim, n_k in zip(para_dims, n_knots, strict=True):
             new_knots = determine_new_knots(
                 # recompute unique to allow duplicating para_dims.
                 kv_unique=self.unique_knots[para_dim],
@@ -303,8 +302,7 @@ def remove_knots(self, parametric_dimension, knots, tolerance=None):
 
         if min(knots) < min(self.knot_vectors[parametric_dimension]):
             raise ValueError(
-                "One of the query knots not in valid knot range. "
-                "(Too small)"
+                "One of the query knots not in valid knot range. (Too small)"
             )
 
         removed = _splinepy_core.remove_knots(

splinepy/helpme/check.py

@@ -38,9 +38,9 @@ def valid_queries(spline, queries):
         error_query = _np.argmin(queries, axis=0)[error_dim]
         raise ValueError(
             f"Query request out of bounds in parametric dimension "
-            f"{error_dim}. Detected query {queries[error_query,:]} at "
+            f"{error_dim}. Detected query {queries[error_query, :]} at "
             f"positions {error_query}, which is out of bounds with "
-            f"minimum values {bounds[0,:]}."
+            f"minimum values {bounds[0, :]}."
         )
 
     # Check maximum value
@@ -50,9 +50,9 @@ def valid_queries(spline, queries):
         error_query = _np.argmax(queries, axis=0)[error_dim]
         raise ValueError(
             f"Query request out of bounds in parametric dimension "
-            f"{error_dim}. Detected query {queries[error_query,:]} at "
+            f"{error_dim}. Detected query {queries[error_query, :]} at "
             f"positions {error_query}, which is out of bounds with "
-            f"maximum values {bounds[1,:]}."
+            f"maximum values {bounds[1, :]}."
         )
     return True
 
@@ -78,7 +78,7 @@ def clamped_knot_vectors(spline, warning=True):
     if degrees is None or knot_vectors is None:
         return None
 
-    for d, kv in zip(degrees, knot_vectors):
+    for d, kv in zip(degrees, knot_vectors, strict=True):
         kv_arr = _np.asanyarray(kv)
 
         front = all(abs(kv_arr[: (d + 1)] - kv_arr[0]) < _settings.TOLERANCE)

splinepy/helpme/create.py

@@ -106,8 +106,7 @@ def extruded(spline, extrusion_vector=None):
         )
     else:
         raise ValueError(
-            "Dimension Mismatch between extrusion extrusion vector "
-            "and spline."
+            "Dimension Mismatch between extrusion extrusion vector and spline."
         )
 
     # Start Extrusion
@@ -222,7 +221,7 @@ def revolved(
     # rotation-matrix is only implemented for 2D and 3D problems
     if cps.shape[1] not in {2, 3}:
         raise NotImplementedError(
-            "Sorry," "revolutions only implemented for 2D and 3D splines"
+            "Sorry,revolutions only implemented for 2D and 3D splines"
         )
 
     # Angle must be (0, pi) non including
@@ -406,6 +405,7 @@ def determinant_spline(spline):
             spline.unique_knots,
             spline.knot_multiplicities,
             multiplicity_increase,
+            strict=True,
         ):
             # increase knot multiplicities:
             #   @ each inner knot -> mult_inc + 1
@@ -420,7 +420,9 @@ def determinant_spline(spline):
             [
                 len(kvs_ds) - d_ds - 1
                 for kvs_ds, d_ds in zip(
-                    knot_vectors_determinant_spline, degrees_determinant_spline
+                    knot_vectors_determinant_spline,
+                    degrees_determinant_spline,
+                    strict=True,
                 )
             ]
         )
@@ -506,7 +508,7 @@ def parametric_view(spline, axes=True, conform=False):
         # process knots to insert
         if spline.has_knot_vectors:
             for i, (kv, d) in enumerate(
-                zip(spline.knot_vectors, spline.degrees)
+                zip(spline.knot_vectors, spline.degrees, strict=True)
             ):
                 n_repeating = int(d + 1)
                 query = kv[n_repeating:-n_repeating]

splinepy/io/gismo.py

@@ -270,7 +270,7 @@ def add_assembly_options(
         children_list = []
 
         for label, description, value, number_type in zip(
-            labels, descriptions, values, number_types
+            labels, descriptions, values, number_types, strict=True
         ):
             children_list.append(
                 {
@@ -644,7 +644,9 @@ def export(
             boundary_data.text = "\n".join(
                 [
                     str(patch_id + index_offset) + " " + str(local_face_id + 1)
-                    for (patch_id, local_face_id) in zip(*face_id_list)
+                    for (patch_id, local_face_id) in zip(
+                        *face_id_list, strict=True
+                    )
                 ]
             )
     else:
@@ -657,7 +659,9 @@ def export(
             boundary_data.text = "\n".join(
                 [
                     str(sid + index_offset) + " " + str(bid + 1)
-                    for (sid, bid) in zip(boundary_spline, boundary_face)
+                    for (sid, bid) in zip(
+                        boundary_spline, boundary_face, strict=True
+                    )
                 ]
             )
         ###
@@ -685,7 +689,9 @@ def export(
                 bc.text = "\n".join(
                     [
                         str(sid) + " " + str(bid + 1)
-                        for (sid, bid) in zip(bc_data_i[0], bc_data_i[1])
+                        for (sid, bid) in zip(
+                            bc_data_i[0], bc_data_i[1], strict=True
+                        )
                     ]
                 )
 
@@ -704,9 +710,9 @@ def export(
             as_base64=as_base64,
             field_mask=field_mask,
         )
-        field_xml.find("MultiPatch").find("patches").text = (
-            f"{index_offset} " f"{n_patches - 1  + index_offset}"
-        )
+        field_xml.find("MultiPatch").find(
+            "patches"
+        ).text = f"{index_offset} {n_patches - 1 + index_offset}"
         if int(_python_version.split(".")[1]) >= 9 and indent:
             _ET.indent(field_xml)
         file_content = _ET.tostring(field_xml)
@@ -723,7 +729,7 @@ def export(
     if n_patches != len(multipatch.patches):
         raise RuntimeError("Help - some patches were not recognised")
 
-    patch_range.text = f"{index_offset} " f"{n_patches - 1 + index_offset}"
+    patch_range.text = f"{index_offset} {n_patches - 1 + index_offset}"
 
     # Add additional options to the xml file
     if additional_blocks is not None:
@@ -976,12 +982,11 @@ def make_dictionary(ETelement):
             list_of_options.append(make_dictionary(child))
         else:
             _debug(
-                f"Found unsupported keyword {child.tag}, which will be"
-                " ignored"
+                f"Found unsupported keyword {child.tag}, which will be ignored"
             )
             continue
 
-    _debug(f"Found a total of {len(list_of_splines)} " f"BSplines and NURBS")
+    _debug(f"Found a total of {len(list_of_splines)} BSplines and NURBS")
     multipatch = _Multipatch(list_of_splines)
     if interface_array is not None:
         if invalid_integer in interface_array: