lewis: disable for Python 3.12+, move by default to Python 3.11

epics-extensions · Jan 13, 2025 · 507fa0d · 507fa0d
1 parent ce88b39
commit 507fa0d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -76,7 +76,10 @@ in
 
       channel-finder-service = callPackage ./epnix/tools/channel-finder/service {};
 
-      inherit (final.python3Packages) lewis pyepics;
+      # Lewis needs Python < 3.12
+      inherit (final.python311Packages) lewis;
+
+      inherit (final.python3Packages) pyepics;
       inherit (callPackage ./epnix/tools/lewis/lib.nix {}) mkLewisSimulator;
 
       pcas = callPackage ./epnix/tools/pcas {};

diff --git a/pkgs/epnix/tools/lewis/default.nix b/pkgs/epnix/tools/lewis/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   buildPythonPackage,
+  pythonAtLeast,
   fetchFromGitHub,
   approvaltests,
   setuptools,
@@ -18,6 +19,9 @@ buildPythonPackage rec {
   version = "1.3.1";
   pyproject = true;
 
+  # Due to mrjob, which is needed by approvaltests
+  disabled = pythonAtLeast "3.12";
+
   src = fetchFromGitHub {
     owner = "ess-dmsc";
     repo = "lewis";