From ffef8f169a7030704e7a516194b10328bf65894c Mon Sep 17 00:00:00 2001
From: Alexander Clausen <alex@gc-web.de>
Date: Tue, 1 Oct 2024 18:54:35 +0200
Subject: [PATCH] Bump our minimum LiberTEM version requirement to v0.12+

Bump our data backend packages to 0.2.14+ to get the latest stability
improvements.
---
 pyproject.toml                               | 8 ++++----
 tests/detectors/merlin/test_merlin_mockds.py | 5 +----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 6ca48a38..3d68afcc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,15 +9,15 @@ description = "Live processing with LiberTEM"
 requires-python = ">=3.9"
 license-files = { paths = ["LICENSE", "src/libertem_live/detectors/LICENSE"] }
 dependencies = [
-    "libertem>=0.11.0.dev0",
+    "libertem>=0.12",
     "numpy",
     "click",
     "tqdm",
     "opentelemetry-api",
     "sparseconverter>=0.3.3",
-    "libertem-dectris>=0.2.12",
-    "libertem-asi-tpx3>=0.2.12",
-    "libertem-qd-mpx>=0.2.12",
+    "libertem-dectris>=0.2.14",
+    "libertem-asi-tpx3>=0.2.14",
+    "libertem-qd-mpx>=0.2.14",
 ]
 keywords = ["electron microscopy"]
 classifiers = [
diff --git a/tests/detectors/merlin/test_merlin_mockds.py b/tests/detectors/merlin/test_merlin_mockds.py
index ccefde68..88586b5e 100644
--- a/tests/detectors/merlin/test_merlin_mockds.py
+++ b/tests/detectors/merlin/test_merlin_mockds.py
@@ -124,10 +124,7 @@ def test_timeout_cancelled(
     mock_merlin_detector_sim,
     mock_merlin_control_sim,
 ):
-    try:
-        from libertem.exceptions import UDFRunCancelled
-    except ImportError:
-        pytest.skip("Needs LiberTEM v0.12+")
+    from libertem.exceptions import UDFRunCancelled
     host, port = mock_merlin_detector_sim
     api_host, api_port = mock_merlin_control_sim
     with ctx_pipelined.make_connection('merlin').open(