Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

python310Packages.opencv3: remove #260727

Merged
merged 11 commits into from
Nov 6, 2023
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/bpycv/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
, fetchPypi
, fetchurl
, minexr
, opencv3
, opencv4
, python3Packages
, requests
, runCommand
Expand All @@ -33,7 +33,7 @@ buildPythonPackage rec {
minexr
zcs
requests
opencv3
opencv4
boxx
];

Expand Down
13 changes: 8 additions & 5 deletions pkgs/development/python-modules/camelot/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/easyocr/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
, hdf5
, numpy
, onnx
, opencv3
, opencv4
, pillow
, pyaml
, pyclipper
Expand Down Expand Up @@ -40,7 +40,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
hdf5
numpy
opencv3
opencv4
pillow
pyaml
pyclipper
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/imagecorruptions/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
, numpy
, scikit-image
, lib
, opencv3
, opencv4
}:

buildPythonPackage rec {
Expand All @@ -23,7 +23,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
numpy
scikit-image
opencv3
opencv4
];

doCheck = false;
Expand Down
10 changes: 4 additions & 6 deletions pkgs/development/python-modules/imantics/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
, fetchFromGitHub
, lib
, numpy
, opencv3
, sphinx-rtd-theme
, opencv4
, lxml
, xmljson
, pytestCheckHook
}:

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

propagatedBuildInputs = [
numpy
opencv3
sphinx-rtd-theme
opencv4
lxml
xmljson
];
Expand All @@ -32,8 +31,7 @@ buildPythonPackage rec {
--replace "'opencv-python>=3'," ""
'';

# failing on NixOS
doCheck = false;
nativeCheckInputs = [ pytestCheckHook ];

pythonImportsCheck = [ "imantics" ];

Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/imutils/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, opencv3
, opencv4
}:

buildPythonPackage rec {
Expand All @@ -13,7 +13,7 @@ buildPythonPackage rec {
sha256 = "03827a9fca8b5c540305c0844a62591cf35a0caec199cb0f2f0a4a0fb15d8f24";
};

propagatedBuildInputs = [ opencv3 ];
propagatedBuildInputs = [ opencv4 ];

# no tests
doCheck = false;
Expand Down
2 changes: 0 additions & 2 deletions pkgs/development/python-modules/moviepy/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
, tqdm
# Advanced image processing (triples size of output)
, advancedProcessing ? false
, opencv3
, scikit-image
, scikit-learn
, scipy
Expand Down Expand Up @@ -47,7 +46,6 @@ buildPythonPackage rec {
requests
proglog
] ++ lib.optionals advancedProcessing [
opencv3
scikit-image
scikit-learn
scipy
Expand Down
5 changes: 3 additions & 2 deletions pkgs/development/python-modules/stytra/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
, nose
, numba
, numpy
, opencv3
, opencv4
, pandas
, pims
, pyqt5
Expand Down Expand Up @@ -48,7 +48,7 @@ buildPythonPackage rec {
'';

propagatedBuildInputs = [
opencv3
opencv4
pyqt5
pyqtgraph
numpy
Expand Down Expand Up @@ -84,5 +84,6 @@ buildPythonPackage rec {
homepage = "https://github.com/portugueslab/stytra";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ tbenst ];
broken = true; # incompatible with pyqtgraph>0.13.0: https://github.com/portugueslab/stytra/issues/87
};
}
1 change: 0 additions & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -34223,7 +34223,6 @@ with pkgs;
shotcut = libsForQt5.callPackage ../applications/video/shotcut { };

shogun = callPackage ../applications/science/machine-learning/shogun {
opencv = opencv3;
protobuf = protobuf3_21;
};

Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/python-aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ mapAliases ({
Nuitka = nuitka; # added 2023-02-19
ntlm-auth = throw "ntlm-auth has been removed, because it relies on the md4 implementation provided by openssl. Use pyspnego instead.";
openapi-schema-pydantic = throw "openapi-schema-pydantic has been removed, since it is no longer maintained"; # added 2023-10-30
opencv3 = throw "opencv3 has been removed as it is obsolete"; # added 2023-10-12
opsdroid_get_image_size = opsdroid-get-image-size; # added 2023-10-16
ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28
pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19
Expand Down
5 changes: 0 additions & 5 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8443,11 +8443,6 @@ self: super: with self; {

opencontainers = callPackage ../development/python-modules/opencontainers { };

opencv3 = toPythonModule (pkgs.opencv3.override {
enablePython = true;
pythonPackages = self;
});

opencv4 = toPythonModule (pkgs.opencv4.override {
enablePython = true;
pythonPackages = self;
Expand Down