From d0e4af844e2d5d6da8bf9d754f1e750d4a1ecedf Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Tue, 21 Dec 2021 00:09:35 +0200 Subject: [PATCH] napari&deps: rename setuptools_scm setuptools-scm --- pkgs/development/python-modules/docstring-parser/default.nix | 4 ++-- pkgs/development/python-modules/magicgui/default.nix | 4 ++-- pkgs/development/python-modules/napari-console/default.nix | 4 ++-- .../python-modules/napari-plugin-engine/default.nix | 4 ++-- pkgs/development/python-modules/napari-svg/default.nix | 4 ++-- pkgs/development/python-modules/napari/default.nix | 4 ++-- pkgs/development/python-modules/psygnal/default.nix | 4 ++-- pkgs/development/python-modules/superqt/default.nix | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/docstring-parser/default.nix b/pkgs/development/python-modules/docstring-parser/default.nix index 2cce5e56b1e4..5408b11c7d8a 100644 --- a/pkgs/development/python-modules/docstring-parser/default.nix +++ b/pkgs/development/python-modules/docstring-parser/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , setuptools -, setuptools_scm +, setuptools-scm , wheel , pytest }: buildPythonPackage rec { @@ -14,7 +14,7 @@ rev = "${version}"; sha256 = "sha256-hQuPJQrGvDs4dJrMLSR4sSnqy45xrF2ufinBG+azuCg="; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ pytest setuptools wheel ]; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/magicgui/default.nix b/pkgs/development/python-modules/magicgui/default.nix index 4357b9462716..03ca9d791597 100644 --- a/pkgs/development/python-modules/magicgui/default.nix +++ b/pkgs/development/python-modules/magicgui/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools_scm +, setuptools-scm , pytestCheckHook , pytest-mypy-plugins , typing-extensions @@ -18,7 +18,7 @@ rev = "v${version}"; sha256 = "sha256-DvL1szk2RoCrpisjp0BVNL6qFZtYc2oYDenX59Cxbug="; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ typing-extensions qtpy pyside2 psygnal docstring-parser ]; checkInputs = [ pytestCheckHook pytest-mypy-plugins ]; doCheck = false; # Reports "Fatal Python error" diff --git a/pkgs/development/python-modules/napari-console/default.nix b/pkgs/development/python-modules/napari-console/default.nix index 214553a9821e..f809587f75f2 100644 --- a/pkgs/development/python-modules/napari-console/default.nix +++ b/pkgs/development/python-modules/napari-console/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools_scm +, setuptools-scm , pytestCheckHook , pytest , ipython @@ -18,7 +18,7 @@ rev = "v${version}"; sha256 = "sha256-aVdYOzkZ+dqB680oDjNCg6quXU+QgUZI09E/MSTagyA="; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; # setup.py somehow requires pytest propagatedBuildInputs = [ pytest ipython ipykernel napari-plugin-engine imageio qtconsole ]; chechInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/napari-plugin-engine/default.nix b/pkgs/development/python-modules/napari-plugin-engine/default.nix index a722786fb2fc..802b25e8df14 100644 --- a/pkgs/development/python-modules/napari-plugin-engine/default.nix +++ b/pkgs/development/python-modules/napari-plugin-engine/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools_scm +, setuptools-scm , pytestCheckHook }: buildPythonPackage rec { pname = "napari-plugin-engine"; @@ -12,7 +12,7 @@ rev = "v${version}"; sha256 = "sha256-cKpCAEYYRq3UPje7REjzhEe1J9mmrtXs8TBnxWukcNE="; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytestCheckHook ]; doCheck = false; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/napari-svg/default.nix b/pkgs/development/python-modules/napari-svg/default.nix index 4df71b01084b..89101e824445 100644 --- a/pkgs/development/python-modules/napari-svg/default.nix +++ b/pkgs/development/python-modules/napari-svg/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools_scm +, setuptools-scm , pytestCheckHook , vispy , napari-plugin-engine @@ -15,7 +15,7 @@ rev = "v${version}"; sha256 = "sha256-20NLi6JTugP+hxqF2AnhSkuvhkGGbeG+tT3M2SZbtRc="; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ vispy napari-plugin-engine imageio ]; checkInputs = [ pytestCheckHook ]; doCheck = false; # Circular dependency: napari diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 7cad250e1f6b..74936da4f725 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -2,7 +2,7 @@ , mkDerivationWith , buildPythonPackage , fetchFromGitHub -, setuptools_scm +, setuptools-scm , superqt , typing-extensions , tifffile @@ -35,7 +35,7 @@ rev = "v${version}"; sha256 = "sha256-0QSI0mgDjF70/X58fE7uWwlBUCGY5gsvbCm4oJkp2Yk="; }; - nativeBuildInputs = [ setuptools_scm wrapQtAppsHook ]; + nativeBuildInputs = [ setuptools-scm wrapQtAppsHook ]; propagatedBuildInputs = [ napari-plugin-engine cachey diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index da61f52fa0f8..6ac20798e0c0 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , wheel , setuptools -, setuptools_scm +, setuptools-scm , pytestCheckHook , pytest-mypy-plugins , pytest-cov @@ -20,7 +20,7 @@ rev = "v${version}"; sha256 = "sha256-SiG2ywNEw3aNrRXyEMFTnvHKtKowO8yqoCaNI8PT4/Y="; }; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ typing-extensions ]; checkInputs = [ pytestCheckHook pytest-cov pytest-mypy-plugins ]; doCheck = false; # mypy checks are failing diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index b6d800d00d2b..9890a7000a9a 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools_scm +, setuptools-scm , pyqt5 , typing-extensions , pytest @@ -16,7 +16,7 @@ sha256 = "sha256-rkTiCJ8mIogS9SDmLPiaAyhhuBx3kk6rXjCc19zbwiM="; }; format = "pyproject"; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ pyqt5 typing-extensions ]; checkInputs = [ pytestCheckHook pytest ]; doCheck = false; # Segfaults...