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

Merge pull request #260727 from bcdarwin/opencv-python-updates 

python310Packages.opencv3: remove
parents c95728ce daa5214d

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

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
, fetchPypi

, fetchurl

, minexr

, opencv3

, opencv4

, python3Packages

, requests

, runCommand
@@ -32,7 +32,7 @@ buildPythonPackage rec { 
    minexr

    zcs

    requests

    opencv3

    opencv4

    boxx

  ];

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

+8 −5
Original line number Diff line number Diff line
@@ -10,15 +10,16 @@ 
, pandas

, tabulate

, click

, pdfminer

, pdfminer-six

, pypdf

, opencv3

, opencv4

, setuptools

}:



buildPythonPackage rec {

  pname = "camelot-py";

  version = "0.11.0";

  format = "setuptools";

  pyproject = true;



  disabled = pythonOlder "3.7";
@@ -27,16 +28,18 @@ buildPythonPackage rec { 
    hash = "sha256-l6fZBtaF5AWaSlSaY646UfCrcqPIJlV/hEPGWhGB3+Y=";

  };



  nativeBuildInputs = [ setuptools ];



  propagatedBuildInputs = [

    charset-normalizer

    chardet

    pandas

    tabulate

    click

    pdfminer

    pdfminer-six

    openpyxl

    pypdf

    opencv3

    opencv4

  ];



  doCheck = false;

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

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
, hdf5

, numpy

, onnx

, opencv3

, opencv4

, pillow

, pyaml

, pyclipper
@@ -40,7 +40,7 @@ buildPythonPackage rec { 
  propagatedBuildInputs = [

    hdf5

    numpy

    opencv3

    opencv4

    pillow

    pyaml

    pyclipper

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

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

, scikit-image

, lib

, opencv3

, opencv4

}:



buildPythonPackage rec {
@@ -23,7 +23,7 @@ buildPythonPackage rec { 
  propagatedBuildInputs = [

    numpy

    scikit-image

    opencv3

    opencv4

  ];



  doCheck = false;

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

+4 −6
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ 
, fetchFromGitHub

, lib

, numpy

, opencv3

, sphinx-rtd-theme

, opencv4

, lxml

, xmljson

, pytestCheckHook

}:



buildPythonPackage rec {
@@ -21,8 +21,7 @@ buildPythonPackage rec { 


  propagatedBuildInputs = [

    numpy

    opencv3

    sphinx-rtd-theme

    opencv4

    lxml

    xmljson

  ];
@@ -32,8 +31,7 @@ buildPythonPackage rec { 
      --replace "'opencv-python>=3'," ""

  '';



  # failing on NixOS

  doCheck = false;

  nativeCheckInputs = [ pytestCheckHook ];



  pythonImportsCheck = [ "imantics" ];