Merge pull request #268260 from fabaff/qcodes-bump

python311Packages.qcodes: 0.41.1 -> 0.42.0, python311Packages.qcodes-loop: remove

4 files changed, 17 insertions, 115 deletions

diff --git a/pkgs/development/python-modules/qcodes-loop/default.nix b/pkgs/development/python-modules/qcodes-loop/default.nix
deleted file mode 100644
index a20841319b741..0000000000000
--- a/pkgs/development/python-modules/qcodes-loop/default.nix
+++ /dev/null
@@ -1,97 +0,0 @@
-{ lib
-, stdenv
-, buildPythonPackage
-, fetchPypi
-, h5py
-, hickle
-, hypothesis
-, ipython
-, lazy-loader
-, matplotlib
-, numpy
-, pandas
-, pyqt5
-, pyqtgraph
-, pytest-mock
-, pytest-xdist
-, pytestCheckHook
-, pythonOlder
-, qcodes
-, setuptools
-, slack-sdk
-, versioningit
-, wheel
-, xarray
-}:
-
-buildPythonPackage rec {
-  pname = "qcodes-loop";
-  version = "0.1.2";
-  pyproject = true;
-
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    inherit version;
-    pname = "qcodes_loop";
-    hash = "sha256-TizNSC49n4Xc2BmJNziARlVXYQxp/LtwmKpgqQkQ3a8=";
-  };
-
-  nativeBuildInputs = [
-    setuptools
-    versioningit
-    wheel
-  ];
-
-  propagatedBuildInputs = [
-    qcodes
-    h5py
-    lazy-loader
-    matplotlib
-    numpy
-    pandas
-    xarray
-    hickle
-    ipython
-  ];
-
-  passthru.optional-dependencies = {
-    qtplot = [
-      pyqtgraph
-    ];
-    slack = [
-      slack-sdk
-    ];
-  };
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    hypothesis
-    pytest-xdist
-    pytest-mock
-    pyqt5
-  ];
-
-  pythonImportsCheck = [
-    "qcodes_loop"
-  ];
-
-  postInstall = ''
-    export HOME="$TMPDIR"
-  '';
-
-  disabledTests = [
-    # AssertionError: False is not true
-    "TestHDF5_Format"
-  ];
-
-  meta = with lib; {
-    description = "Features previously in QCoDeS";
-    homepage = "https://github.com/QCoDeS/Qcodes_loop";
-    changelog = "https://github.com/QCoDeS/Qcodes_loop/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ evilmav ];
-    # Some tests fail on this platform
-    broken = stdenv.isDarwin;
-  };
-}
diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix
index 320054041104e..7db5c72f80c51 100644
--- a/pkgs/development/python-modules/qcodes/default.nix
+++ b/pkgs/development/python-modules/qcodes/default.nix
@@ -4,7 +4,7 @@
 , cf-xarray
 , dask
 , deepdiff
-, fetchPypi
+, fetchFromGitHub
 , h5netcdf
 , h5py
 , hypothesis
@@ -31,7 +31,6 @@
 , pythonOlder
 , pyvisa
 , pyvisa-sim
-, qcodes-loop
 , rsa
 , ruamel-yaml
 , setuptools
@@ -49,14 +48,16 @@
 
 buildPythonPackage rec {
   pname = "qcodes";
-  version = "0.41.1";
-  format = "pyproject";
+  version = "0.42.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.9";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-3Ncg51E4KYbvzlEyesVbTmzmz+UPfFkj3tudVbNYqHQ=";
+  src = fetchFromGitHub {
+    owner = "QCoDeS";
+    repo = "Qcodes";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-+NtPE9mQKWftk3vR5WFZgM+7jl8HWr9MxVA+VpbuHvE=";
   };
 
   nativeBuildInputs = [
@@ -97,12 +98,6 @@ buildPythonPackage rec {
     importlib-metadata
   ];
 
-  passthru.optional-dependencies = {
-    loop = [
-      qcodes-loop
-    ];
-  };
-
   nativeCheckInputs = [
     deepdiff
     hypothesis
@@ -120,21 +115,26 @@ buildPythonPackage rec {
   __darwinAllowLocalNetworking = true;
 
   pytestFlagsArray = [
+    "-v"
+    "-n"
+    "$NIX_BUILD_CORES"
     # Follow upstream with settings
     "--durations=20"
   ];
 
   disabledTestPaths = [
     # Test depends on qcodes-loop, causing a cyclic dependency
-    "qcodes/tests/dataset/measurement/test_load_legacy_data.py"
+    "tests/dataset/measurement/test_load_legacy_data.py"
     # TypeError
-    "qcodes/tests/dataset/test_dataset_basic.py"
+    "tests/dataset/test_dataset_basic.py"
   ];
 
   disabledTests = [
     # Tests are time-sensitive and power-consuming
-    # Those tests fails repeatably
+    # Those tests fails repeatably and are flaky
     "test_access_channels_by_slice"
+    "test_aggregator"
+    "test_datasaver"
     "test_do1d_additional_setpoints_shape"
     "test_dond_1d_additional_setpoints_shape"
     "test_field_limits"
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 3605c63736644..ccac3710dcd90 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -374,6 +374,7 @@ mapAliases ({
   qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
   qds_sdk = qds-sdk; # added 2023-10-21
   Quandl = quandl; # added 2023-02-19
+  qcodes-loop = throw "qcodes-loop has been removed due to deprecation"; # added 2023-11-30
   qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages";
   rabbitpy = throw "rabbitpy has been removed, since it is unmaintained and broken"; # added 2023-07-01
   radio_beam = radio-beam; # added 2023-11-04
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 970c05a0f36b8..ee7379a862f1d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11951,8 +11951,6 @@ self: super: with self; {
 
   qcodes-contrib-drivers = callPackage ../development/python-modules/qcodes-contrib-drivers { };
 
-  qcodes-loop = callPackage ../development/python-modules/qcodes-loop { };
-
   qcs-api-client = callPackage ../development/python-modules/qcs-api-client { };
 
   qdarkstyle = callPackage ../development/python-modules/qdarkstyle { };