Unverified Commit b61e40be authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #218388 from marsam/fix-pythonImportsCheck-usage 

treewide: fix pythonImportsCheck usage
parents cc09f943 5ffdf341

pkgs/development/libraries/science/math/faiss/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ stdenv.mkDerivation { 
  '';



  # Need buildPythonPackage for this one

  # pythonCheckImports = [

  # pythonImportsCheck = [

  #   "faiss"

  # ];

pkgs/development/python-modules/dvc-azure/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
, adlfs

, azure-identity

, buildPythonPackage

, dvc-objects

, fetchPypi

, knack

, pythonRelaxDepsHook
@@ -23,13 +24,13 @@ buildPythonPackage rec { 
  nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ];



  propagatedBuildInputs = [

    adlfs azure-identity knack

    adlfs azure-identity dvc-objects knack

  ];



  # Network access is needed for tests

  doCheck = false;



  pythonCheckImports = [ "dvc_azure" ];

  pythonImportsCheck = [ "dvc_azure" ];



  meta = with lib; {

    description = "azure plugin for dvc";

pkgs/development/python-modules/dvc-gs/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ buildPythonPackage rec { 
  # Network access is needed for tests

  doCheck = false;



  pythonCheckImports = [ "dvc_gs" ];

  pythonImportsCheck = [ "dvc_gs" ];



  meta = with lib; {

    description = "gs plugin for dvc";

pkgs/development/python-modules/dvc-s3/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
, aiobotocore

, boto3

, buildPythonPackage

, dvc-objects

, fetchPypi

, flatten-dict

, pythonRelaxDepsHook
@@ -29,13 +30,13 @@ buildPythonPackage rec { 
  nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ];



  propagatedBuildInputs = [

    aiobotocore boto3 flatten-dict s3fs

    aiobotocore boto3 dvc-objects flatten-dict s3fs

  ];



  # Network access is needed for tests

  doCheck = false;



  pythonCheckImports = [ "dvc_s3" ];

  pythonImportsCheck = [ "dvc_s3" ];



  meta = with lib; {

    description = "s3 plugin for dvc";

pkgs/development/python-modules/dvc-ssh/default.nix

+3 −2
Original line number Diff line number Diff line 
{ lib

, bcrypt

, buildPythonPackage

, dvc-objects

, fetchPypi

, pythonRelaxDepsHook

, setuptools-scm
@@ -22,7 +23,7 @@ buildPythonPackage rec { 


  nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ];



  propagatedBuildInputs = [ bcrypt sshfs ];

  propagatedBuildInputs = [ bcrypt dvc-objects sshfs ];



  # bcrypt is enabled for sshfs in nixpkgs

  postPatch = ''
@@ -32,7 +33,7 @@ buildPythonPackage rec { 
  # Network access is needed for tests

  doCheck = false;



  pythonCheckImports = [ "dvc_ssh" ];

  pythonImportsCheck = [ "dvc_ssh" ];



  meta = with lib; {

    description = "ssh plugin for dvc";