pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #231826 from mweinelt/scikitimage-alias

python310Packages.scikit-image: rename from scikitimage

authored by

Martin Weinelt and committed by
GitHub 177eb5dd 8c22ab65

+55 -54
unified split
+1 -1
pkgs/applications/science/math/caffe/default.nix
··· 84 propagatedBuildInputs = lib.optionals pythonSupport ( 85 # requirements.txt 86 let pp = python.pkgs; in ([ 87 - pp.numpy pp.scipy pp.scikitimage pp.h5py 88 pp.matplotlib pp.ipython pp.networkx pp.nose 89 pp.pandas pp.python-dateutil pp.protobuf pp.gflags 90 pp.pyyaml pp.pillow pp.six
··· 84 propagatedBuildInputs = lib.optionals pythonSupport ( 85 # requirements.txt 86 let pp = python.pkgs; in ([ 87 + pp.numpy pp.scipy pp.scikit-image pp.h5py 88 pp.matplotlib pp.ipython pp.networkx pp.nose 89 pp.pandas pp.python-dateutil pp.protobuf pp.gflags 90 pp.pyyaml pp.pillow pp.six
+2 -2
pkgs/development/python-modules/aplpy/default.nix
··· 14 , pytestCheckHook 15 , pythonOlder 16 , reproject 17 - , scikitimage 18 , shapely 19 }: 20 ··· 44 pyavm 45 pyregion 46 reproject 47 - scikitimage 48 shapely 49 ]; 50
··· 14 , pytestCheckHook 15 , pythonOlder 16 , reproject 17 + , scikit-image 18 , shapely 19 }: 20 ··· 44 pyavm 45 pyregion 46 reproject 47 + scikit-image 48 shapely 49 ]; 50
+2 -2
pkgs/development/python-modules/batchgenerators/default.nix
··· 9 , fetchpatch 10 , scipy 11 , scikit-learn 12 - , scikitimage 13 , threadpoolctl 14 }: 15 ··· 33 pillow 34 scipy 35 scikit-learn 36 - scikitimage 37 threadpoolctl 38 ]; 39
··· 9 , fetchpatch 10 , scipy 11 , scikit-learn 12 + , scikit-image 13 , threadpoolctl 14 }: 15 ··· 33 pillow 34 scipy 35 scikit-learn 36 + scikit-image 37 threadpoolctl 38 ]; 39
+2 -2
pkgs/development/python-modules/boxx/default.nix
··· 4 , python 5 , xvfb-run 6 , matplotlib 7 - , scikitimage 8 , numpy 9 , pandas 10 , imageio ··· 31 32 propagatedBuildInputs = [ 33 matplotlib 34 - scikitimage 35 numpy 36 pandas 37 imageio
··· 4 , python 5 , xvfb-run 6 , matplotlib 7 + , scikit-image 8 , numpy 9 , pandas 10 , imageio ··· 31 32 propagatedBuildInputs = [ 33 matplotlib 34 + scikit-image 35 numpy 36 pandas 37 imageio
+2 -2
pkgs/development/python-modules/bsuite/default.nix
··· 10 , absl-py 11 , dm-env 12 , plotnine 13 - , scikitimage 14 , dm-tree 15 , patsy 16 , tensorflow-probability ··· 45 pandas 46 patsy 47 plotnine 48 - scikitimage 49 scipy 50 statsmodels 51 termcolor
··· 10 , absl-py 11 , dm-env 12 , plotnine 13 + , scikit-image 14 , dm-tree 15 , patsy 16 , tensorflow-probability ··· 45 pandas 46 patsy 47 plotnine 48 + scikit-image 49 scipy 50 statsmodels 51 termcolor
+2 -2
pkgs/development/python-modules/dask-image/default.nix
··· 7 , pims 8 , pytestCheckHook 9 , pythonOlder 10 - , scikitimage 11 , scipy 12 }: 13 ··· 32 33 nativeCheckInputs = [ 34 pytestCheckHook 35 - scikitimage 36 ]; 37 38 postPatch = ''
··· 7 , pims 8 , pytestCheckHook 9 , pythonOlder 10 + , scikit-image 11 , scipy 12 }: 13 ··· 32 33 nativeCheckInputs = [ 34 pytestCheckHook 35 + scikit-image 36 ]; 37 38 postPatch = ''
+2 -2
pkgs/development/python-modules/dm-haiku/tests.nix
··· 12 , bsuite 13 , frozendict 14 , dm-env 15 - , scikitimage 16 , rlax 17 , distrax 18 , tensorflow-probability ··· 42 pytestCheckHook 43 optax 44 rlax 45 - scikitimage 46 tensorflow 47 tensorflow-probability 48 ];
··· 12 , bsuite 13 , frozendict 14 , dm-env 15 + , scikit-image 16 , rlax 17 , distrax 18 , tensorflow-probability ··· 42 pytestCheckHook 43 optax 44 rlax 45 + scikit-image 46 tensorflow 47 tensorflow-probability 48 ];
+2 -2
pkgs/development/python-modules/easyocr/default.nix
··· 9 , pyclipper 10 , python-bidi 11 , torch 12 - , scikitimage 13 , scipy 14 , shapely 15 , torchvision ··· 34 ''; 35 36 propagatedBuildInputs = [ 37 - scikitimage 38 hdf5 39 python-bidi 40 numpy
··· 9 , pyclipper 10 , python-bidi 11 , torch 12 + , scikit-image 13 , scipy 14 , shapely 15 , torchvision ··· 34 ''; 35 36 propagatedBuildInputs = [ 37 + scikit-image 38 hdf5 39 python-bidi 40 numpy
+2 -2
pkgs/development/python-modules/glymur/default.nix
··· 7 , openjpeg 8 , pytestCheckHook 9 , pythonOlder 10 - , scikitimage 11 , setuptools 12 }: 13 ··· 36 nativeCheckInputs = [ 37 lxml 38 pytestCheckHook 39 - scikitimage 40 ]; 41 42 postConfigure = ''
··· 7 , openjpeg 8 , pytestCheckHook 9 , pythonOlder 10 + , scikit-image 11 , setuptools 12 }: 13 ··· 36 nativeCheckInputs = [ 37 lxml 38 pytestCheckHook 39 + scikit-image 40 ]; 41 42 postConfigure = ''
+2 -2
pkgs/development/python-modules/image-match/default.nix
··· 1 - { lib, buildPythonPackage, fetchFromGitHub, pytest-runner, scikitimage }: 2 3 buildPythonPackage { 4 pname = "image-match"; ··· 14 buildInputs = [ pytest-runner ]; 15 16 propagatedBuildInputs = [ 17 - scikitimage 18 ]; 19 20 # remove elasticsearch requirement due to version incompatibility
··· 1 + { lib, buildPythonPackage, fetchFromGitHub, pytest-runner, scikit-image }: 2 3 buildPythonPackage { 4 pname = "image-match"; ··· 14 buildInputs = [ pytest-runner ]; 15 16 propagatedBuildInputs = [ 17 + scikit-image 18 ]; 19 20 # remove elasticsearch requirement due to version incompatibility
+2 -2
pkgs/development/python-modules/imagecorruptions/default.nix
··· 1 { buildPythonPackage 2 , fetchPypi 3 , numpy 4 - , scikitimage 5 , lib 6 , opencv3 7 }: ··· 22 23 propagatedBuildInputs = [ 24 numpy 25 - scikitimage 26 opencv3 27 ]; 28
··· 1 { buildPythonPackage 2 , fetchPypi 3 , numpy 4 + , scikit-image 5 , lib 6 , opencv3 7 }: ··· 22 23 propagatedBuildInputs = [ 24 numpy 25 + scikit-image 26 opencv3 27 ]; 28
+3 -3
pkgs/development/python-modules/imgaug/default.nix
··· 5 , numpy 6 , opencv3 7 , pytestCheckHook 8 - , scikitimage 9 , scipy 10 , shapely 11 , six ··· 37 imagecorruptions 38 numpy 39 opencv3 40 - scikitimage 41 scipy 42 shapely 43 six ··· 79 platforms = platforms.linux; 80 # Scikit-image 0.19 update broke API, see https://github.com/scikit-image/scikit-image/releases/tag/v0.19.0 81 # and https://github.com/scikit-image/scikit-image/issues/6093 82 - broken = lib.versionAtLeast scikitimage.version "0.19"; 83 }; 84 }
··· 5 , numpy 6 , opencv3 7 , pytestCheckHook 8 + , scikit-image 9 , scipy 10 , shapely 11 , six ··· 37 imagecorruptions 38 numpy 39 opencv3 40 + scikit-image 41 scipy 42 shapely 43 six ··· 79 platforms = platforms.linux; 80 # Scikit-image 0.19 update broke API, see https://github.com/scikit-image/scikit-image/releases/tag/v0.19.0 81 # and https://github.com/scikit-image/scikit-image/issues/6093 82 + broken = lib.versionAtLeast scikit-image.version "0.19"; 83 }; 84 }
+2 -2
pkgs/development/python-modules/intensity-normalization/default.nix
··· 10 , pydicom 11 , pymedio 12 , scikit-fuzzy 13 - , scikitimage 14 , scikit-learn 15 , scipy 16 , simpleitk ··· 45 pydicom 46 pymedio 47 scikit-fuzzy 48 - scikitimage 49 scikit-learn 50 scipy 51 simpleitk
··· 10 , pydicom 11 , pymedio 12 , scikit-fuzzy 13 + , scikit-image 14 , scikit-learn 15 , scipy 16 , simpleitk ··· 45 pydicom 46 pymedio 47 scikit-fuzzy 48 + scikit-image 49 scikit-learn 50 scipy 51 simpleitk
+2 -2
pkgs/development/python-modules/mask-rcnn/default.nix
··· 11 , numpy 12 , opencv3 13 , pillow 14 - , scikitimage 15 , scipy 16 , tensorflow 17 }: ··· 54 numpy 55 opencv3 56 pillow 57 - scikitimage 58 scipy 59 tensorflow 60 ];
··· 11 , numpy 12 , opencv3 13 , pillow 14 + , scikit-image 15 , scipy 16 , tensorflow 17 }: ··· 54 numpy 55 opencv3 56 pillow 57 + scikit-image 58 scipy 59 tensorflow 60 ];
+2 -2
pkgs/development/python-modules/moviepy/default.nix
··· 12 # Advanced image processing (triples size of output) 13 , advancedProcessing ? false 14 , opencv3 15 - , scikitimage 16 , scikit-learn 17 , scipy 18 , matplotlib ··· 48 proglog 49 ] ++ lib.optionals advancedProcessing [ 50 opencv3 51 - scikitimage 52 scikit-learn 53 scipy 54 matplotlib
··· 12 # Advanced image processing (triples size of output) 13 , advancedProcessing ? false 14 , opencv3 15 + , scikit-image 16 , scikit-learn 17 , scipy 18 , matplotlib ··· 48 proglog 49 ] ++ lib.optionals advancedProcessing [ 50 opencv3 51 + scikit-image 52 scikit-learn 53 scipy 54 matplotlib
+2 -2
pkgs/development/python-modules/napari/default.nix
··· 22 , pillow 23 , pythonOlder 24 , pyyaml 25 - , scikitimage 26 , scipy 27 , setuptools-scm 28 , sphinx ··· 84 pydantic 85 pyopengl 86 pyyaml 87 - scikitimage 88 scipy 89 sphinx 90 superqt
··· 22 , pillow 23 , pythonOlder 24 , pyyaml 25 + , scikit-image 26 , scipy 27 , setuptools-scm 28 , sphinx ··· 84 pydantic 85 pyopengl 86 pyyaml 87 + scikit-image 88 scipy 89 sphinx 90 superqt
+2 -2
pkgs/development/python-modules/ome-zarr/default.nix
··· 9 , fsspec 10 , numpy 11 , requests 12 - , scikitimage 13 , s3fs 14 , toolz 15 , zarr ··· 44 aiohttp 45 requests 46 s3fs 47 - scikitimage 48 toolz 49 ]; 50
··· 9 , fsspec 10 , numpy 11 , requests 12 + , scikit-image 13 , s3fs 14 , toolz 15 , zarr ··· 44 aiohttp 45 requests 46 s3fs 47 + scikit-image 48 toolz 49 ]; 50
+2 -2
pkgs/development/python-modules/pims/default.nix
··· 5 , numpy 6 , pytestCheckHook 7 , pythonOlder 8 - , scikitimage 9 , slicerator 10 }: 11 ··· 31 32 nativeCheckInputs = [ 33 pytestCheckHook 34 - scikitimage 35 ]; 36 37 pythonImportsCheck = [
··· 5 , numpy 6 , pytestCheckHook 7 , pythonOlder 8 + , scikit-image 9 , slicerator 10 }: 11 ··· 31 32 nativeCheckInputs = [ 33 pytestCheckHook 34 + scikit-image 35 ]; 36 37 pythonImportsCheck = [
+2 -2
pkgs/development/python-modules/psd-tools/default.nix
··· 4 , pythonOlder 5 , docopt 6 , pillow 7 - , scikitimage 8 , aggdraw 9 , pytestCheckHook 10 , ipython ··· 34 docopt 35 ipython 36 pillow 37 - scikitimage 38 ]; 39 40 nativeCheckInputs = [
··· 4 , pythonOlder 5 , docopt 6 , pillow 7 + , scikit-image 8 , aggdraw 9 , pytestCheckHook 10 , ipython ··· 34 docopt 35 ipython 36 pillow 37 + scikit-image 38 ]; 39 40 nativeCheckInputs = [
+2 -2
pkgs/development/python-modules/pywick/default.nix
··· 13 , pyyaml 14 , scipy 15 , requests 16 - , scikitimage 17 , six 18 , tabulate 19 , torch ··· 52 pyyaml 53 scipy 54 requests 55 - scikitimage 56 tabulate 57 torch 58 torchvision
··· 13 , pyyaml 14 , scipy 15 , requests 16 + , scikit-image 17 , six 18 , tabulate 19 , torch ··· 52 pyyaml 53 scipy 54 requests 55 + scikit-image 56 tabulate 57 torch 58 torchvision
+2 -2
pkgs/development/python-modules/ray/default.nix
··· 43 , pyyaml 44 , redis 45 , requests 46 - , scikitimage 47 , scipy 48 , setproctitle 49 , smart-open ··· 103 gym 104 lz4 105 matplotlib 106 - scikitimage 107 pyyaml 108 scipy 109 ];
··· 43 , pyyaml 44 , redis 45 , requests 46 + , scikit-image 47 , scipy 48 , setproctitle 49 , smart-open ··· 103 gym 104 lz4 105 matplotlib 106 + scikit-image 107 pyyaml 108 scipy 109 ];
+2 -2
pkgs/development/python-modules/slicedimage/default.nix
··· 8 , pathlib 9 , numpy 10 , requests 11 - , scikitimage 12 , six 13 , pytestCheckHook 14 , isPy27 ··· 32 packaging 33 numpy 34 requests 35 - scikitimage 36 six 37 tifffile 38 ] ++ lib.optionals isPy27 [ pathlib enum34 ];
··· 8 , pathlib 9 , numpy 10 , requests 11 + , scikit-image 12 , six 13 , pytestCheckHook 14 , isPy27 ··· 32 packaging 33 numpy 34 requests 35 + scikit-image 36 six 37 tifffile 38 ] ++ lib.optionals isPy27 [ pathlib enum34 ];
+2 -2
pkgs/development/python-modules/stytra/default.nix
··· 25 , pythonOlder 26 , qdarkstyle 27 , qimage2ndarray 28 - , scikitimage 29 , scipy 30 , tables 31 }: ··· 57 pandas 58 tables 59 git 60 - scikitimage 61 matplotlib 62 qdarkstyle 63 gitpython
··· 25 , pythonOlder 26 , qdarkstyle 27 , qimage2ndarray 28 + , scikit-image 29 , scipy 30 , tables 31 }: ··· 57 pandas 58 tables 59 git 60 + scikit-image 61 matplotlib 62 qdarkstyle 63 gitpython
+2 -2
pkgs/development/python-modules/sunpy/default.nix
··· 21 , pytest-mock 22 , python-dateutil 23 , pythonOlder 24 - , scikitimage 25 , scipy 26 , setuptools-scm 27 , sqlalchemy ··· 62 sqlalchemy 63 ]; 64 image = [ 65 - scikitimage 66 scipy 67 ]; 68 net = [
··· 21 , pytest-mock 22 , python-dateutil 23 , pythonOlder 24 + , scikit-image 25 , scipy 26 , setuptools-scm 27 , sqlalchemy ··· 62 sqlalchemy 63 ]; 64 image = [ 65 + scikit-image 66 scipy 67 ]; 68 net = [
+2 -2
pkgs/development/python-modules/tensorflow-datasets/default.nix
··· 29 , pytest-xdist 30 , pytestCheckHook 31 , requests 32 - , scikitimage 33 , scipy 34 , six 35 , tensorflow ··· 96 pydub 97 pytest-xdist 98 pytestCheckHook 99 - scikitimage 100 scipy 101 tensorflow 102 tifffile
··· 29 , pytest-xdist 30 , pytestCheckHook 31 , requests 32 + , scikit-image 33 , scipy 34 , six 35 , tensorflow ··· 96 pydub 97 pytest-xdist 98 pytestCheckHook 99 + scikit-image 100 scipy 101 tensorflow 102 tifffile
+2 -2
pkgs/development/python-modules/torchmetrics/default.nix
··· 3 , fetchFromGitHub 4 , cloudpickle 5 , scikit-learn 6 - , scikitimage 7 , packaging 8 , psutil 9 , py-deprecate ··· 40 nativeCheckInputs = [ 41 pytorch-lightning 42 scikit-learn 43 - scikitimage 44 cloudpickle 45 psutil 46 pytestCheckHook
··· 3 , fetchFromGitHub 4 , cloudpickle 5 , scikit-learn 6 + , scikit-image 7 , packaging 8 , psutil 9 , py-deprecate ··· 40 nativeCheckInputs = [ 41 pytorch-lightning 42 scikit-learn 43 + scikit-image 44 cloudpickle 45 psutil 46 pytestCheckHook
+1 -1
pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
··· 15918 "cython", 15919 "setuptools" 15920 ], 15921 - "scikitimage": [ 15922 "cython", 15923 "setuptools" 15924 ],
··· 15918 "cython", 15919 "setuptools" 15920 ], 15921 + "scikit-image": [ 15922 "cython", 15923 "setuptools" 15924 ],
+1
pkgs/top-level/python-aliases.nix
··· 265 ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01 266 runway-python = throw "SDK has been deprecated and was archived by upstream"; # added 2023-05-03 267 sapi-python-client = kbcstorage; # added 2022-04-20 268 scikitlearn = scikit-learn; # added 2021-07-21 269 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10 270 setuptools_scm = setuptools-scm; # added 2021-06-03
··· 265 ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01 266 runway-python = throw "SDK has been deprecated and was archived by upstream"; # added 2023-05-03 267 sapi-python-client = kbcstorage; # added 2022-04-20 268 + scikitimage = scikit-image; # added 2023-05-14 269 scikitlearn = scikit-learn; # added 2021-07-21 270 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10 271 setuptools_scm = setuptools-scm; # added 2021-06-03
+1 -1
pkgs/top-level/python-packages.nix
··· 10783 10784 scikit-hep-testdata = callPackage ../development/python-modules/scikit-hep-testdata { }; 10785 10786 - scikitimage = callPackage ../development/python-modules/scikit-image { }; 10787 10788 scikit-learn = callPackage ../development/python-modules/scikit-learn { 10789 inherit (pkgs) gfortran glibcLocales;
··· 10783 10784 scikit-hep-testdata = callPackage ../development/python-modules/scikit-hep-testdata { }; 10785 10786 + scikit-image = callPackage ../development/python-modules/scikit-image { }; 10787 10788 scikit-learn = callPackage ../development/python-modules/scikit-learn { 10789 inherit (pkgs) gfortran glibcLocales;