Merge pull request #264308 from fabaff/qcodes-loop-fix

python311Packages.qcodes-loop: remove patch

pkgs/development/python-modules/qcodes-loop/default.nix

@@ -1,34 +1,33 @@
 { lib
 , stdenv
-, fetchpatch
-, fetchPypi
-, pythonOlder
 , buildPythonPackage
-, qcodes
+, 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
-, hickle
-, ipython
-, slack-sdk
-, hypothesis
-, pytest-xdist
-, pytest-mock
-, pyqtgraph
-, pyqt5
-, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "qcodes-loop";
   version = "0.1.2";
-  format = "pyproject";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
@@ -38,15 +37,6 @@ buildPythonPackage rec {
     hash = "sha256-TizNSC49n4Xc2BmJNziARlVXYQxp/LtwmKpgqQkQ3a8=";
   };
 
-  patches = [
-    # https://github.com/QCoDeS/Qcodes_loop/pull/39
-    (fetchpatch {
-      name = "relax-versioningit-dependency.patch";
-      url = "https://github.com/QCoDeS/Qcodes_loop/commit/58006d3fb57344ae24dd44bceca98004617b5b57.patch";
-      hash = "sha256-mSlm/Ql8e5xPL73ifxSoVc9+U58AAcAmBkdW5P6zEsg=";
-    })
-  ];
-
   nativeBuildInputs = [
     setuptools
     versioningit
@@ -82,11 +72,8 @@ buildPythonPackage rec {
     pyqt5
   ];
 
-  pythonImportsCheck = [ "qcodes_loop" ];
-
-  disabledTestPaths = [
-    # test broken in 0.1.1, see https://github.com/QCoDeS/Qcodes_loop/pull/25
-    "src/qcodes_loop/tests/test_hdf5formatter.py"
+  pythonImportsCheck = [
+    "qcodes_loop"
   ];
 
   postInstall = ''
@@ -96,6 +83,7 @@ buildPythonPackage rec {
   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