b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

python310Packages.scikit-image: rename from scikitimage

Browse source 
to match the pname and create an alias for the former name.
This commit is contained in:
Martin Weinelt 2023-05-14 13:04:10 +02:00
parent 176aaf016a
commit cddb66d655
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
29 changed files with 55 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/science/math/caffe/default.nix
View file

@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = lib.optionals pythonSupport ( propagatedBuildInputs = lib.optionals pythonSupport (
# requirements.txt # requirements.txt
let pp = python.pkgs; in ([ let pp = python.pkgs; in ([
pp.numpy pp.scipy pp.scikitimage pp.h5py pp.numpy pp.scipy pp.scikit-image pp.h5py
pp.matplotlib pp.ipython pp.networkx pp.nose pp.matplotlib pp.ipython pp.networkx pp.nose
pp.pandas pp.python-dateutil pp.protobuf pp.gflags pp.pandas pp.python-dateutil pp.protobuf pp.gflags
pp.pyyaml pp.pillow pp.six pp.pyyaml pp.pillow pp.six

4
pkgs/development/python-modules/aplpy/default.nix
View file

@ -14,7 +14,7 @@
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, reproject , reproject
, scikitimage , scikit-image
, shapely , shapely
}: }:
@ -44,7 +44,7 @@ buildPythonPackage rec {
pyavm pyavm
pyregion pyregion
reproject reproject
scikitimage scikit-image
shapely shapely
]; ];

4
pkgs/development/python-modules/batchgenerators/default.nix
View file

@ -9,7 +9,7 @@
, fetchpatch , fetchpatch
, scipy , scipy
, scikit-learn , scikit-learn
, scikitimage , scikit-image
, threadpoolctl , threadpoolctl
}: }:
@ -33,7 +33,7 @@ buildPythonPackage rec {
pillow pillow
scipy scipy
scikit-learn scikit-learn
scikitimage scikit-image
threadpoolctl threadpoolctl
]; ];

4
pkgs/development/python-modules/boxx/default.nix
View file

@ -4,7 +4,7 @@
, python , python
, xvfb-run , xvfb-run
, matplotlib , matplotlib
, scikitimage , scikit-image
, numpy , numpy
, pandas , pandas
, imageio , imageio
@ -31,7 +31,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
matplotlib matplotlib
scikitimage scikit-image
numpy numpy
pandas pandas
imageio imageio

4
pkgs/development/python-modules/bsuite/default.nix
View file

@ -10,7 +10,7 @@
, absl-py , absl-py
, dm-env , dm-env
, plotnine , plotnine
, scikitimage , scikit-image
, dm-tree , dm-tree
, patsy , patsy
, tensorflow-probability , tensorflow-probability
@ -45,7 +45,7 @@ let bsuite = buildPythonPackage rec {
pandas pandas
patsy patsy
plotnine plotnine
scikitimage scikit-image
scipy scipy
statsmodels statsmodels
termcolor termcolor

4
pkgs/development/python-modules/dask-image/default.nix
View file

@ -7,7 +7,7 @@
, pims , pims
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, scikitimage , scikit-image
, scipy , scipy
}: }:
@ -32,7 +32,7 @@ buildPythonPackage rec {
nativeCheckInputs = [ nativeCheckInputs = [
pytestCheckHook pytestCheckHook
scikitimage scikit-image
]; ];
postPatch = '' postPatch = ''

4
pkgs/development/python-modules/dm-haiku/tests.nix
View file

@ -12,7 +12,7 @@
, bsuite , bsuite
, frozendict , frozendict
, dm-env , dm-env
, scikitimage , scikit-image
, rlax , rlax
, distrax , distrax
, tensorflow-probability , tensorflow-probability
@ -42,7 +42,7 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
optax optax
rlax rlax
scikitimage scikit-image
tensorflow tensorflow
tensorflow-probability tensorflow-probability
]; ];

4
pkgs/development/python-modules/easyocr/default.nix
View file

@ -9,7 +9,7 @@
, pyclipper , pyclipper
, python-bidi , python-bidi
, torch , torch
, scikitimage , scikit-image
, scipy , scipy
, shapely , shapely
, torchvision , torchvision
@ -34,7 +34,7 @@ buildPythonPackage rec {
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [
scikitimage scikit-image
hdf5 hdf5
python-bidi python-bidi
numpy numpy

4
pkgs/development/python-modules/glymur/default.nix
View file

@ -7,7 +7,7 @@
, openjpeg , openjpeg
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, scikitimage , scikit-image
, setuptools , setuptools
}: }:
@ -36,7 +36,7 @@ buildPythonPackage rec {
nativeCheckInputs = [ nativeCheckInputs = [
lxml lxml
pytestCheckHook pytestCheckHook
scikitimage scikit-image
]; ];
postConfigure = '' postConfigure = ''

4
pkgs/development/python-modules/image-match/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, scikitimage }: { lib, buildPythonPackage, fetchFromGitHub, pytest-runner, scikit-image }:
buildPythonPackage { buildPythonPackage {
pname = "image-match"; pname = "image-match";
@ -14,7 +14,7 @@ buildPythonPackage {
buildInputs = [ pytest-runner ]; buildInputs = [ pytest-runner ];
propagatedBuildInputs = [ propagatedBuildInputs = [
scikitimage scikit-image
]; ];
# remove elasticsearch requirement due to version incompatibility # remove elasticsearch requirement due to version incompatibility

4
pkgs/development/python-modules/imagecorruptions/default.nix
View file

@ -1,7 +1,7 @@
{ buildPythonPackage { buildPythonPackage
, fetchPypi , fetchPypi
, numpy , numpy
, scikitimage , scikit-image
, lib , lib
, opencv3 , opencv3
}: }:
@ -22,7 +22,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
numpy numpy
scikitimage scikit-image
opencv3 opencv3
]; ];

6
pkgs/development/python-modules/imgaug/default.nix
View file

@ -5,7 +5,7 @@
, numpy , numpy
, opencv3 , opencv3
, pytestCheckHook , pytestCheckHook
, scikitimage , scikit-image
, scipy , scipy
, shapely , shapely
, six , six
@ -37,7 +37,7 @@ buildPythonPackage rec {
imagecorruptions imagecorruptions
numpy numpy
opencv3 opencv3
scikitimage scikit-image
scipy scipy
shapely shapely
six six
@ -79,6 +79,6 @@ buildPythonPackage rec {
platforms = platforms.linux; platforms = platforms.linux;
# Scikit-image 0.19 update broke API, see https://github.com/scikit-image/scikit-image/releases/tag/v0.19.0 # Scikit-image 0.19 update broke API, see https://github.com/scikit-image/scikit-image/releases/tag/v0.19.0
# and https://github.com/scikit-image/scikit-image/issues/6093 # and https://github.com/scikit-image/scikit-image/issues/6093
broken = lib.versionAtLeast scikitimage.version "0.19"; broken = lib.versionAtLeast scikit-image.version "0.19";
}; };
} }

4
pkgs/development/python-modules/intensity-normalization/default.nix
View file

@ -7,7 +7,7 @@
, nibabel , nibabel
, numpy , numpy
, scikit-fuzzy , scikit-fuzzy
, scikitimage , scikit-image
, scikit-learn , scikit-learn
, scipy , scipy
, statsmodels , statsmodels
@ -31,7 +31,7 @@ buildPythonPackage rec {
nibabel nibabel
numpy numpy
scikit-fuzzy scikit-fuzzy
scikitimage scikit-image
scikit-learn scikit-learn
scipy scipy
statsmodels statsmodels

4
pkgs/development/python-modules/mask-rcnn/default.nix
View file

@ -11,7 +11,7 @@
, numpy , numpy
, opencv3 , opencv3
, pillow , pillow
, scikitimage , scikit-image
, scipy , scipy
, tensorflow , tensorflow
}: }:
@ -54,7 +54,7 @@ buildPythonPackage rec {
numpy numpy
opencv3 opencv3
pillow pillow
scikitimage scikit-image
scipy scipy
tensorflow tensorflow
]; ];

4
pkgs/development/python-modules/moviepy/default.nix
View file

@ -12,7 +12,7 @@
# Advanced image processing (triples size of output) # Advanced image processing (triples size of output)
, advancedProcessing ? false , advancedProcessing ? false
, opencv3 , opencv3
, scikitimage , scikit-image
, scikit-learn , scikit-learn
, scipy , scipy
, matplotlib , matplotlib
@ -48,7 +48,7 @@ buildPythonPackage rec {
proglog proglog
] ++ lib.optionals advancedProcessing [ ] ++ lib.optionals advancedProcessing [
opencv3 opencv3
scikitimage scikit-image
scikit-learn scikit-learn
scipy scipy
matplotlib matplotlib

4
pkgs/development/python-modules/napari/default.nix
View file

@ -22,7 +22,7 @@
, pillow , pillow
, pythonOlder , pythonOlder
, pyyaml , pyyaml
, scikitimage , scikit-image
, scipy , scipy
, setuptools-scm , setuptools-scm
, sphinx , sphinx
@ -84,7 +84,7 @@ mkDerivationWith buildPythonPackage rec {
pydantic pydantic
pyopengl pyopengl
pyyaml pyyaml
scikitimage scikit-image
scipy scipy
sphinx sphinx
superqt superqt

4
pkgs/development/python-modules/ome-zarr/default.nix
View file

@ -9,7 +9,7 @@
, fsspec , fsspec
, numpy , numpy
, requests , requests
, scikitimage , scikit-image
, s3fs , s3fs
, toolz , toolz
, zarr , zarr
@ -44,7 +44,7 @@ buildPythonPackage rec {
aiohttp aiohttp
requests requests
s3fs s3fs
scikitimage scikit-image
toolz toolz
]; ];

4
pkgs/development/python-modules/pims/default.nix
View file

@ -5,7 +5,7 @@
, numpy , numpy
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, scikitimage , scikit-image
, slicerator , slicerator
}: }:
@ -31,7 +31,7 @@ buildPythonPackage rec {
nativeCheckInputs = [ nativeCheckInputs = [
pytestCheckHook pytestCheckHook
scikitimage scikit-image
]; ];
pythonImportsCheck = [ pythonImportsCheck = [

4
pkgs/development/python-modules/psd-tools/default.nix
View file

@ -4,7 +4,7 @@
, pythonOlder , pythonOlder
, docopt , docopt
, pillow , pillow
, scikitimage , scikit-image
, aggdraw , aggdraw
, pytestCheckHook , pytestCheckHook
, ipython , ipython
@ -34,7 +34,7 @@ buildPythonPackage rec {
docopt docopt
ipython ipython
pillow pillow
scikitimage scikit-image
]; ];
nativeCheckInputs = [ nativeCheckInputs = [

4
pkgs/development/python-modules/pywick/default.nix
View file

@ -13,7 +13,7 @@
, pyyaml , pyyaml
, scipy , scipy
, requests , requests
, scikitimage , scikit-image
, six , six
, tabulate , tabulate
, torch , torch
@ -52,7 +52,7 @@ buildPythonPackage rec {
pyyaml pyyaml
scipy scipy
requests requests
scikitimage scikit-image
tabulate tabulate
torch torch
torchvision torchvision

4
pkgs/development/python-modules/ray/default.nix
View file

@ -43,7 +43,7 @@
, pyyaml , pyyaml
, redis , redis
, requests , requests
, scikitimage , scikit-image
, scipy , scipy
, setproctitle , setproctitle
, smart-open , smart-open
@ -103,7 +103,7 @@ buildPythonPackage rec {
gym gym
lz4 lz4
matplotlib matplotlib
scikitimage scikit-image
pyyaml pyyaml
scipy scipy
]; ];

4
pkgs/development/python-modules/slicedimage/default.nix
View file

@ -8,7 +8,7 @@
, pathlib , pathlib
, numpy , numpy
, requests , requests
, scikitimage , scikit-image
, six , six
, pytestCheckHook , pytestCheckHook
, isPy27 , isPy27
@ -32,7 +32,7 @@ buildPythonPackage rec {
packaging packaging
numpy numpy
requests requests
scikitimage scikit-image
six six
tifffile tifffile
] ++ lib.optionals isPy27 [ pathlib enum34 ]; ] ++ lib.optionals isPy27 [ pathlib enum34 ];

4
pkgs/development/python-modules/stytra/default.nix
View file

@ -25,7 +25,7 @@
, pythonOlder , pythonOlder
, qdarkstyle , qdarkstyle
, qimage2ndarray , qimage2ndarray
, scikitimage , scikit-image
, scipy , scipy
, tables , tables
}: }:
@ -57,7 +57,7 @@ buildPythonPackage rec {
pandas pandas
tables tables
git git
scikitimage scikit-image
matplotlib matplotlib
qdarkstyle qdarkstyle
gitpython gitpython

4
pkgs/development/python-modules/sunpy/default.nix
View file

@ -21,7 +21,7 @@
, pytest-mock , pytest-mock
, python-dateutil , python-dateutil
, pythonOlder , pythonOlder
, scikitimage , scikit-image
, scipy , scipy
, setuptools-scm , setuptools-scm
, sqlalchemy , sqlalchemy
@ -62,7 +62,7 @@ buildPythonPackage rec {
sqlalchemy sqlalchemy
]; ];
image = [ image = [
scikitimage scikit-image
scipy scipy
]; ];
net = [ net = [

4
pkgs/development/python-modules/tensorflow-datasets/default.nix
View file

@ -29,7 +29,7 @@
, pytest-xdist , pytest-xdist
, pytestCheckHook , pytestCheckHook
, requests , requests
, scikitimage , scikit-image
, scipy , scipy
, six , six
, tensorflow , tensorflow
@ -96,7 +96,7 @@ buildPythonPackage rec {
pydub pydub
pytest-xdist pytest-xdist
pytestCheckHook pytestCheckHook
scikitimage scikit-image
scipy scipy
tensorflow tensorflow
tifffile tifffile

4
pkgs/development/python-modules/torchmetrics/default.nix
View file

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, cloudpickle , cloudpickle
, scikit-learn , scikit-learn
, scikitimage , scikit-image
, packaging , packaging
, psutil , psutil
, py-deprecate , py-deprecate
@ -40,7 +40,7 @@ buildPythonPackage {
nativeCheckInputs = [ nativeCheckInputs = [
pytorch-lightning pytorch-lightning
scikit-learn scikit-learn
scikitimage scikit-image
cloudpickle cloudpickle
psutil psutil
pytestCheckHook pytestCheckHook

2
pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
View file

@ -15918,7 +15918,7 @@
"cython", "cython",
"setuptools" "setuptools"
], ],
"scikitimage": [ "scikit-image": [
"cython", "cython",
"setuptools" "setuptools"
], ],

1
pkgs/top-level/python-aliases.nix
View file

@ -264,6 +264,7 @@ mapAliases ({
ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01 ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01
runway-python = throw "SDK has been deprecated and was archived by upstream"; # added 2023-05-03 runway-python = throw "SDK has been deprecated and was archived by upstream"; # added 2023-05-03
sapi-python-client = kbcstorage; # added 2022-04-20 sapi-python-client = kbcstorage; # added 2022-04-20
scikitimage = scikit-image; # added 2023-05-14
scikitlearn = scikit-learn; # added 2021-07-21 scikitlearn = scikit-learn; # added 2021-07-21
selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10
setuptools_scm = setuptools-scm; # added 2021-06-03 setuptools_scm = setuptools-scm; # added 2021-06-03

2
pkgs/top-level/python-packages.nix
View file

@ -10776,7 +10776,7 @@ self: super: with self; {
scikit-hep-testdata = callPackage ../development/python-modules/scikit-hep-testdata { }; scikit-hep-testdata = callPackage ../development/python-modules/scikit-hep-testdata { };
scikitimage = callPackage ../development/python-modules/scikit-image { }; scikit-image = callPackage ../development/python-modules/scikit-image { };
scikit-learn = callPackage ../development/python-modules/scikit-learn { scikit-learn = callPackage ../development/python-modules/scikit-learn {
inherit (pkgs) gfortran glibcLocales; inherit (pkgs) gfortran glibcLocales;