Merge branch 'master' into staging-next

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

@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "build";
-  version = "0.0.3.1";
+  version = "0.1.0";
 
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "757b5542168326b6f1898a1ce1131bb2cf306ee4c7e54e39c815c5be217ff87d";
+    sha256 = "sha256-CLK1gJj/YX0RVAVsefinC+7Rj3z6cQvKI6ByGWkQ1bQ=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/check-manifest/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git, build }:
 
 buildPythonPackage rec {
   pname = "check-manifest";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     substituteInPlace tests.py --replace "test_build_sdist" "no_test_build_sdist"
   '';
 
-  propagatedBuildInputs = [ pep517 toml ];
+  propagatedBuildInputs = [ build pep517 toml ];
 
   checkInputs = [ mock breezy git ];
 

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

@@ -35,9 +35,10 @@ buildPythonPackage rec {
     "TestQCOW2"
     "TestRAW"
     "TestVMDKConversion"
+  ] ++ lib.optionals stdenv.isDarwin [
+    "test_serial_fixup_invalid_host"
   ];
 
-
   # argparse is part of the standardlib
   prePatch = ''
     substituteInPlace setup.py --replace "'argparse'," ""

pkgs/development/python-modules/grpcio-tools/default.nix

@@ -1,12 +1,12 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools }:
+{ lib, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools }:
 
 buildPythonPackage rec {
   pname = "grpcio-tools";
-  version = "1.34.0";
+  version = "1.34.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "db5a6f0130256d534cbe35eab37d37a448d96f4fd736e5051c6be1aee49cea1d";
+    sha256 = "b411f36748f4ead33411544d785e37825598bbb8abbe79eca422e395be5a3d08";
   };
 
   outputs = [ "out" "dev" ];
@@ -18,6 +18,8 @@ buildPythonPackage rec {
   # no tests in the package
   doCheck = false;
 
+  pythonImportsCheck = [ "grpc_tools" ];
+
   meta = with lib; {
     description = "Protobuf code generator for gRPC";
     license = licenses.asl20;

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

@@ -68,6 +68,7 @@ buildPythonPackage rec {
     "launch_socket"
     "sock_server"
     "test_list_formats" # tries to find python MIME type
+    "KernelCullingTest" # has a race condition failing on slower hardware
   ] ++ lib.optional stdenv.isDarwin [
     "test_delete"
     "test_checkpoints_follow_file"

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

@@ -5,12 +5,13 @@
 , userpath
 , argcomplete
 , packaging
+, importlib-metadata
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "pipx";
-  version = "0.15.6.0";
+  version = "0.16.0.0";
 
   disabled = pythonOlder "3.6";
 
@@ -19,10 +20,16 @@ buildPythonPackage rec {
     owner = "pipxproject";
     repo = pname;
     rev = version;
-    sha256 = "1yffswayjfkmq86ygisja0mkg55pqj9pdml5nc0z05222sfnvn1a";
+    sha256 = "08mn7vm8iw20pg0gfn491y1jx8wcyjijps6f1hy7ipzd5ckynscn";
   };
 
-  propagatedBuildInputs = [ userpath argcomplete packaging ];
+  propagatedBuildInputs = [
+    userpath
+    argcomplete
+    packaging
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    importlib-metadata
+  ];
 
   checkInputs = [ pytestCheckHook ];
 
@@ -31,6 +38,7 @@ buildPythonPackage rec {
   '';
 
   # disable tests, which require internet connection
+  pytestFlagsArray = [ "--ignore=tests/test_install_all_packages.py" ];
   disabledTests = [
     "install"
     "inject"
@@ -38,10 +46,12 @@ buildPythonPackage rec {
     "missing_interpreter"
     "cache"
     "internet"
+    "run"
     "runpip"
     "upgrade"
     "suffix"
     "legacy_venv"
+    "determination"
   ];
 
   meta = with lib; {

pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix

@@ -1,5 +1,11 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
-, oset, pybtex, pybtex-docutils, sphinx
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, oset
+, pybtex
+, pybtex-docutils
+, sphinx
 }:
 
 buildPythonPackage rec {
@@ -15,10 +21,13 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ];
 
-  meta = {
+  doCheck = false;
+  pythonImportsCheck = [ "sphinxcontrib.bibtex" ];
+
+  meta = with lib; {
     description = "A Sphinx extension for BibTeX style citations";
     homepage = "https://github.com/mcmtroffaes/sphinxcontrib-bibtex";
-    license = stdenv.lib.licenses.bsd2;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
-
 }

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

@@ -26,6 +26,10 @@ buildPythonPackage rec {
     mutatormath
   ];
 
+  # tests require custom commands to run
+  doCheck = false;
+  pythonImportsCheck = [ "ufoProcessor" ];
+
   meta = with lib; {
     description = "Read, write and generate UFOs with designspace data";
     homepage = "https://github.com/LettError/ufoProcessor";