pygeosimplify 0.0.19__tar.gz → 0.0.20__tar.gz

{pygeosimplify-0.0.19 → pygeosimplify-0.0.20}/PKG-INFO

@@ -1,17 +1,19 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: pygeosimplify
-Version: 0.0.19
+Version: 0.0.20
 Summary: Python package for automatic, cell-based inference of clash-free simplified detector geometry.
+License-File: LICENSE
 Author: Joshua Falco Beirer
 Author-email: jbeirer@cern.ch
-Requires-Python: >=3.9,<3.13
+Requires-Python: >=3.10,<4.0
 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: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: distinctipy (>=1.3.4,<2.0.0)
-Requires-Dist: matplotlib (>=3.9.0,<4.0.0)
+Requires-Dist: matplotlib (>=3.9.0,<3.11)
 Requires-Dist: numpy (>=2.0.2,<3.0.0)
 Requires-Dist: pandas (>=2.2.3,<3.0.0)
 Requires-Dist: pyg4ometry (>=1.3.5,<2.0.0)

{pygeosimplify-0.0.19 → pygeosimplify-0.0.20}/pygeosimplify/simplify/helpers.py

@@ -1,6 +1,5 @@
 from itertools import combinations
 from re import Match
-from typing import Optional
 
 import numpy as np
 import pandas as pd
@@ -89,8 +88,8 @@ def check_world_overlap(
 
         for pair in overlap_lines:
             # Extract the actual layer names without the "Layer_" prefix and "_Phys" suffix
-            first_match: Optional[Match[str]] = re.search(r"Layer_(.*?)_Phys", pair[0])
-            second_match: Optional[Match[str]] = re.search(r"Layer_(.*?)_Phys", pair[1])
+            first_match: Match[str] | None = re.search(r"Layer_(.*?)_Phys", pair[0])
+            second_match: Match[str] | None = re.search(r"Layer_(.*?)_Phys", pair[1])
 
             if first_match and second_match:
                 first = first_match.group(1)

{pygeosimplify-0.0.19 → pygeosimplify-0.0.20}/pygeosimplify/simplify/layer.py

@@ -100,22 +100,22 @@ class GeoLayer:
         if self.coordinate_system == "XYZ":
             return [
                 XYZCell(dx, dy, dz, pos=XYZ(x, y, z))
-                for dx, dy, dz, x, y, z in zip(df.dx, df.dy, df.dz, df.x, df.y, df.z)
+                for dx, dy, dz, x, y, z in zip(df.dx, df.dy, df.dz, df.x, df.y, df.z, strict=False)
             ]
         elif self.coordinate_system == "EtaPhiR":
             return [
                 EtaPhiRCell(deta, dphi, dr, pos=EtaPhiR(eta, phi, r))
-                for deta, dphi, dr, eta, phi, r in zip(df.deta, df.dphi, df.dr, df.eta, df.phi, df.r)
+                for deta, dphi, dr, eta, phi, r in zip(df.deta, df.dphi, df.dr, df.eta, df.phi, df.r, strict=False)
             ]
         elif self.coordinate_system == "EtaPhiZ":
             return [
                 EtaPhiZCell(deta, dphi, dz, pos=EtaPhiZ(eta, phi, z))
-                for deta, dphi, dz, eta, phi, z in zip(df.deta, df.dphi, df.dz, df.eta, df.phi, df.z)
+                for deta, dphi, dz, eta, phi, z in zip(df.deta, df.dphi, df.dz, df.eta, df.phi, df.z, strict=False)
             ]
         elif self.coordinate_system == "RPhiZ":
             return [
                 RPhiZCell(dr, dphi, dz, pos=RPhiZ(r, phi, z))
-                for dr, dphi, dz, r, phi, z in zip(df.dr, df.dphi, df.dz, df.r, df.phi, df.z)
+                for dr, dphi, dz, r, phi, z in zip(df.dr, df.dphi, df.dz, df.r, df.phi, df.z, strict=False)
             ]
         else:
             raise Exception(f"Invalid coordinate system {self.coordinate_system}.")
@@ -238,7 +238,7 @@ class GeoLayer:
 
     def plot_cell_vertices_rz(
         self,
-        ax: Union[None, plt.Axes] = None,
+        ax: Union[plt.Axes, None] = None,
         color: Union[tuple[float, float, float], str] = "tab:blue",
         marker_size: float = 0.01,
         x_label: str = "z",

{pygeosimplify-0.0.19 → pygeosimplify-0.0.20}/pygeosimplify/vis/cylinder.py

@@ -49,14 +49,14 @@ def generate_cylinder_endcap_points(rmin: float, rmax: float, z: float, linspace
     radii = np.linspace(rmin, rmax, linspace_count)
 
     # Create a grid of points in polar coordinates
-    theta, radii = np.meshgrid(theta, radii)
+    theta_grid, radii_grid = np.meshgrid(theta, radii)
 
     # Convert polar coordinates to Cartesian coordinates
-    x = radii * np.cos(theta)
-    y = radii * np.sin(theta)
-    z = np.full_like(y, z)  # Z coordinate remains constant
+    x = radii_grid * np.cos(theta_grid)
+    y = radii_grid * np.sin(theta_grid)
+    z_values = np.full_like(y, z)  # Z coordinate remains constant
 
-    return x, y, z
+    return x, y, z_values
 
 
 def plot_cylinder(

{pygeosimplify-0.0.19 → pygeosimplify-0.0.20}/pygeosimplify/vis/geo.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional, Union
+from typing import Any, Union
 
 import matplotlib.colors as mcolors
 import matplotlib.pyplot as plt
@@ -16,14 +16,14 @@ from pygeosimplify.vis.scene import CellScene
 
 def plot_geometry(  # noqa: C901
     df: pd.DataFrame,
-    ax: Union[None, Axes3D] = None,
-    layer_list: Optional[list[int]] = None,
-    eta_range: Optional[list] = None,
-    phi_range: Optional[list] = None,
-    axis_labels: Optional[list] = None,
-    color: Optional[str] = None,
+    ax: Union[Axes3D, None] = None,
+    layer_list: list[int] | None = None,
+    eta_range: list | None = None,
+    phi_range: list | None = None,
+    axis_labels: list | None = None,
+    color: str | None = None,
     unit_scale: float = 1,
-    cell_energy_col: Optional[str] = None,
+    cell_energy_col: str | None = None,
     unit_scale_energy: float = 1,
     energy_label: str = "Cell Energy",
     color_map: str = "gist_heat_r",
@@ -75,10 +75,10 @@ def plot_geometry(  # noqa: C901
 
     if not cell_energy_col:
         # Create a color dict mapping a layer to a color
-        layer_color_dict = dict(zip(layer_list, get_colors(len(layer_list), rng=0)))
+        layer_color_dict = dict(zip(layer_list, get_colors(len(layer_list), rng=0), strict=False))
         # If color is specifically provided, override the color dict
         if color:
-            layer_color_dict = {layer: color for layer in layer_list}
+            layer_color_dict = dict.fromkeys(layer_list, color)
         add_cells_to_scene(
             df=df,
             scene=vis,
@@ -149,10 +149,10 @@ def add_cells_to_scene(
     df: pd.DataFrame,
     scene: CellScene,
     unit_scale: float,
-    unit_scale_energy: Optional[float] = 1,
-    layer_color_dict: Optional[dict] = None,
-    colormap: Optional[Any] = None,
-    norm: Optional[mcolors.Normalize] = None,
+    unit_scale_energy: float | None = 1,
+    layer_color_dict: dict | None = None,
+    colormap: Any | None = None,
+    norm: mcolors.Normalize | None = None,
 ) -> None:
     """
     Adds cells to a given scene.

{pygeosimplify-0.0.19 → pygeosimplify-0.0.20}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pygeosimplify"
-version = "v0.0.19"
+version = "0.0.20"
 description = "Python package for automatic, cell-based inference of clash-free simplified detector geometry."
 authors = [
   { name = "Joshua Falco Beirer", email = "jbeirer@cern.ch" }
@@ -12,41 +12,42 @@ packages = [
   { include = "pygeosimplify" }
 ]
 
-requires-python = ">=3.9,<3.13"
+requires-python = ">=3.10,<4.0"
 dynamic = ["dependencies"]
 
 [tool.poetry.dependencies]
-python = ">=3.9,<3.13"
+python = ">=3.10,<4.0"
 uproot = "^5.6.0"
 pandas = "^2.2.3"
 numpy = "^2.0.2"
-matplotlib = "^3.9.0"
+matplotlib = ">=3.9.0,<3.11"
 scipy = "^1.13.1"
 tqdm = "^4.67.1"
 distinctipy = "^1.3.4"
 pyg4ometry = ">=1.3.5,<2.0.0"
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^8.3.4"
-pytest-cov = "^6.0.0"
-deptry = "^0.22.0"
-mypy = "^1.14.1"
+pytest = "^9.1.1"
+pytest-cov = "^7.1.0"
+deptry = "^0.25.1"
+mypy = "^2.3.1"
 pre-commit = "^4.0.1"
 tox = "^4.23.2"
-ipykernel = "^6.29.5"
+ipykernel = "^7.3.0"
+pytest-xdist = "^3.8.0"
 
 [tool.poetry.group.docs.dependencies]
 mkdocs = "^1.6.1"
 mkdocs-material = "^9.5.49"
-mkdocstrings = {extras = ["python"], version = "^0.27.0"}
+mkdocstrings = {extras = ["python"], version = "^1.0.6"}
 
 [build-system]
-requires = ["poetry-core>=2.1.1"]
+requires = ["poetry-core>=2.4.1"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.black]
 line-length = 120
-target-version = ['py39']
+target-version = ['py310']
 preview = true
 
 [tool.mypy]
@@ -69,10 +70,12 @@ filterwarnings = [
 ]
 
 [tool.ruff]
-target-version = "py39"
+target-version = "py310"
 line-length = 120
 fix = true
-lint.select = [
+
+[tool.ruff.lint]
+select = [
     # flake8-2020
     "YTT",
     # flake8-bandit
@@ -104,7 +107,7 @@ lint.select = [
     # tryceratops
     "TRY",
 ]
-lint.ignore = [
+ignore = [
     # LineTooLong
     "E501",
     # DoNotAssignLambda