Merge pull request #88 from xsuite/dev

Version 0.11.13

Author: eltos

.github/workflows/test.yaml

@@ -6,6 +6,7 @@ jobs:
   pytest:
     runs-on: ubuntu-24.04
     strategy:
+      fail-fast: false
       matrix:
         python-version: [ '3.9', '3.10', '3.11', '3.12' ] # , '3.13'
         dep-versions: [ '' ]  # 'numpy1'

tests/test_utils.py

@@ -1,5 +1,8 @@
 import pytest
 import pytest_benchmark
+import pytest_benchmark.plugin
+from pytest_benchmark.utils import NameWrapper
+from pytest_benchmark.fixture import BenchmarkFixture
 import numpy as np
 from numpy.testing import assert_equal
 import xplt.util
@@ -8,8 +11,27 @@
 @pytest.fixture(scope="function")
 def benchmark_ref(request):
     # See https://github.com/ionelmc/pytest-benchmark/issues/166
-    bm = pytest_benchmark.plugin.benchmark.__pytest_wrapped__.obj(request)
-    return next(bm) if hasattr(bm, "__next__") else bm
+    # code below is a copy of `pytest_benchmark.plugin.benchmark` fixture
+    bs = request.config._benchmarksession
+
+    if bs.skip:
+        pytest.skip("Benchmarks are skipped (--benchmark-skip was used).")
+    else:
+        node = request.node
+        marker = node.get_closest_marker("benchmark")
+        options = dict(marker.kwargs) if marker else {}
+        if "timer" in options:
+            options["timer"] = NameWrapper(options["timer"])
+        fixture = BenchmarkFixture(
+            node,
+            add_stats=bs.benchmarks.append,
+            logger=bs.logger,
+            warner=request.node.warn,
+            disabled=bs.disabled,
+            **dict(bs.options, **options),
+        )
+        request.addfinalizer(fixture._cleanup)
+        return fixture
 
 
 @pytest.mark.parametrize(

xplt/__init__.py

@@ -5,7 +5,7 @@
 __contact__ = "[email protected]"
 
 
-__version__ = "0.11.12"
+__version__ = "0.11.13"
 
 
 # expose the following in global namespace

xplt/line.py

@@ -368,9 +368,9 @@ def ang(a):
                 RT - ARC / 2 + HELICITY * np.pi / 2
             )  # angle between plot x-axis and radial vector of bending
 
-            LENGTH = get(survey, "length", np.zeros_like(NAME))
-            IS_THICK = get(survey, "isthick", np.zeros_like(NAME))
-            ORDER = get(survey, "order", -np.ones_like(NAME))
+            LENGTH = get(survey, "length", np.zeros(len(NAME)))
+            IS_THICK = get(survey, "isthick", np.zeros(len(NAME), "bool"))
+            ORDER = get(survey, "order", -np.ones(len(NAME), "int"))
             if (TYPE := get(survey, "element_type", None)) is not None:
                 # map element type to order when order is not in survey
                 for type, o in {