Merge pull request #220237 from SuperSandro2000/python310Packages.argcomplete

python310Packages.argcomplete: 2.0.0 -> 2.1.1

pkgs/applications/version-management/commitizen/default.nix

@@ -1,4 +1,5 @@
 { buildPythonApplication
+, charset-normalizer
 , colorama
 , commitizen
 , decli
@@ -41,10 +42,12 @@ buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace 'charset-normalizer = "^2.1.0"' 'charset-normalizer = "*"'
+      --replace 'charset-normalizer = "^2.1.0"' 'charset-normalizer = "*"' \
+      --replace 'argcomplete = ">=1.12.1,<2.1"' 'argcomplete = ">=1.12.1"'
   '';
 
   propagatedBuildInputs = [
+    charset-normalizer
     termcolor
     questionary
     colorama

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

@@ -1,30 +1,29 @@
-{ buildPythonPackage, fetchPypi, lib
-, dicttoxml
-, importlib-metadata
+{ buildPythonPackage
+, fetchPypi
+, lib
 , pexpect
-, prettytable
-, requests-toolbelt
 }:
+
 buildPythonPackage rec {
   pname = "argcomplete";
-  version = "2.0.0";
+  version = "2.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6372ad78c89d662035101418ae253668445b391755cfe94ea52f1b9d22425b20";
+    sha256 = "sha256-cuCDQIUtMlREWcDBmq0bSKosOpbejG5XQkVrT1OMpS8=";
   };
 
-  doCheck = false; # meant to be ran with interactive interpreter
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace '"coverage",' "" \
+      --replace " + lint_require" ""
+  '';
 
-  # re-enable if we are able to make testing work
-  # nativeCheckInputs = [ bashInteractive coverage flake8 ];
+  # tries to build and install test packages which fails
+  doCheck = false;
 
   propagatedBuildInputs = [
-    dicttoxml
-    importlib-metadata
     pexpect
-    prettytable
-    requests-toolbelt
   ];
 
   pythonImportsCheck = [ "argcomplete" ];

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

@@ -10,6 +10,8 @@
 , pytest-timeout
 , pytestCheckHook
 , pythonOlder
+, setuptools
+, stdenv
 , typing-extensions
 , wrapt
 , uptime
@@ -37,6 +39,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     msgpack
     packaging
+    setuptools
     typing-extensions
     wrapt
   ];
@@ -73,10 +76,16 @@ buildPythonPackage rec {
     # pytest.approx is not supported in a boolean context (since pytest7)
     "test_pack_unpack"
     "test_receive"
+  ] ++ lib.optionals stdenv.isDarwin [
+    # timing sensitive
+    "test_general"
+    "test_gap"
   ];
 
   preCheck = ''
     export PATH="$PATH:$out/bin";
+    # skips timing senstive tests
+    export CI=1
   '';
 
   pythonImportsCheck = [

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

@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "jcrist";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-TGCdsimcoY3441/nOXxHGqYM4q8uoWd78HtUts6EOJY=";
+    hash = "sha256-Sq0hV5ZftUCIR/6QOWvdfzg8UHYLZXo5ba5ydTnjqPg=";
   };
 
   # Requires libasan to be accessible