python312Packages.linien-common: fix build (#341388)

pkgs/development/python-modules/linien-common/default.nix

@@ -5,7 +5,7 @@
   setuptools,
   importlib-metadata,
   numpy,
-  rpyc4,
+  rpyc,
   scipy,
   appdirs,
   callPackage,
@@ -29,12 +29,14 @@ buildPythonPackage rec {
     export HOME=$(mktemp -d)
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  pythonRelaxDeps = [ "importlib-metadata" ];
+
+  dependencies = [
     importlib-metadata
     numpy
-    rpyc4
+    rpyc
     scipy
     appdirs
   ];

pkgs/development/python-modules/linien-common/tests.nix

@@ -1,26 +1,45 @@
 {
   buildPythonPackage,
-  linien-common,
+  cma,
   linien-client,
+  linien-common,
+  matplotlib,
+  migen,
+  misoc,
+  pytest-plt,
   pytestCheckHook,
 }:
 
 buildPythonPackage {
   pname = "linien-tests";
   inherit (linien-common) version src;
-  format = "other";
   pyproject = false;
 
   dontBuild = true;
   dontInstall = true;
 
   nativeCheckInputs = [
-    linien-common
+    cma
     linien-client
+    linien-common
+    matplotlib
+    migen
+    misoc
+    pytest-plt
     pytestCheckHook
   ];
 
   preCheck = ''
     export HOME=$(mktemp -d)
   '';
+
+  disabledTestPaths = [
+    # require linien-server which is not packaged
+    "tests/test_algorithm_selection.py"
+    "tests/test_approacher.py"
+    "tests/test_optimizer_engines.py"
+    "tests/test_optimizer_utils.py"
+    "tests/test_robust_autolock.py"
+    "tests/test_simple_autolock_cpu.py"
+  ];
 }

pkgs/development/python-modules/rpyc4/default.nix

@@ -1,69 +0,0 @@
-{
-  lib,
-  stdenv,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  hatchling,
-  plumbum,
-  pytestCheckHook,
-  pythonOlder,
-  pythonAtLeast,
-}:
-
-buildPythonPackage rec {
-  pname = "rpyc4";
-  # Pinned version for linien, see also:
-  # https://github.com/linien-org/pyrp3/pull/10#discussion_r1302816237
-  version = "4.1.5";
-  format = "pyproject";
-
-  # Since this is an outdated version, upstream might have fixed the
-  # compatibility issues with Python3.12, but we can't enjoy them yet.
-  disabled = pythonOlder "3.7" || pythonAtLeast "3.12";
-
-  src = fetchFromGitHub {
-    owner = "tomerfiliba";
-    repo = "rpyc";
-    rev = version;
-    hash = "sha256-8NOcXZDR3w0TNj1+LZ7lzQAt7yDgspjOp2zk1bsbVls=";
-  };
-
-  nativeBuildInputs = [
-    setuptools
-    hatchling
-  ];
-
-  propagatedBuildInputs = [ plumbum ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  disabledTests = [
-    # Disable tests that requires network access
-    "test_api"
-    "test_close_timeout"
-    "test_deploy"
-    "test_listing"
-    "test_pruning"
-    "test_rpyc"
-    # Test is outdated
-    # ssl.SSLError: [SSL: NO_CIPHERS_AVAILABLE] no ciphers available (_ssl.c:997)
-    "test_ssl_conenction"
-  ];
-  disabledTestPaths = [
-    "tests/test_ssh.py"
-    "tests/test_teleportation.py"
-  ];
-
-  pythonImportsCheck = [ "rpyc" ];
-
-  doCheck = !stdenv.isDarwin;
-
-  meta = with lib; {
-    description = "Remote Python Call (RPyC), a transparent and symmetric RPC library";
-    homepage = "https://rpyc.readthedocs.org";
-    changelog = "https://github.com/tomerfiliba-org/rpyc/blob/${version}/CHANGELOG.rst";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
-  };
-}

pkgs/top-level/python-packages.nix

@@ -13736,8 +13736,6 @@ self: super: with self; {
 
   rpyc = callPackage ../development/python-modules/rpyc { };
 
-  rpyc4 = callPackage ../development/python-modules/rpyc4 { };
-
   rq = callPackage ../development/python-modules/rq {
     redis-server = pkgs.redis;
   };