From 936f5b64ab7228c49478705272a8958292579274 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 17:55:36 +0200 Subject: [PATCH 01/13] python312Packages.app-model: 0.2.6 -> 0.2.7 Diff: https://github.com/pyapp-kit/app-model/compare/refs/tags/v0.2.6...v0.2.7 Changelog: https://github.com/pyapp-kit/app-model/blob/v0.2.7/CHANGELOG.md --- pkgs/development/python-modules/app-model/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/app-model/default.nix b/pkgs/development/python-modules/app-model/default.nix index 7dc1c65349ea..bf1c9c14d198 100644 --- a/pkgs/development/python-modules/app-model/default.nix +++ b/pkgs/development/python-modules/app-model/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "app-model"; - version = "0.2.6"; + version = "0.2.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = "app-model"; rev = "refs/tags/v${version}"; - hash = "sha256-EMlxY9Xna9e3kWJ7X8oRuLHEmivwVFcEXRDvZfN2rNY="; + hash = "sha256-ISMSt7c8CoxffMhg7XC/ebKkgXFTBihDr1fGkqMCBoc="; }; nativeBuildInputs = [ From 39e85027ab71c15ef36c34a47ad71ad6381d0096 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 17:56:05 +0200 Subject: [PATCH 02/13] python312Packages.app-model: refactor --- pkgs/development/python-modules/app-model/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/app-model/default.nix b/pkgs/development/python-modules/app-model/default.nix index bf1c9c14d198..d7fa932800a4 100644 --- a/pkgs/development/python-modules/app-model/default.nix +++ b/pkgs/development/python-modules/app-model/default.nix @@ -26,12 +26,12 @@ buildPythonPackage rec { hash = "sha256-ISMSt7c8CoxffMhg7XC/ebKkgXFTBihDr1fGkqMCBoc="; }; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling ]; - propagatedBuildInputs = [ + dependencies = [ psygnal pydantic pydantic-compat From b22ba0ead9e741af00d75ea41c08c840bf38b67f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 17:56:21 +0200 Subject: [PATCH 03/13] python312Packages.app-model: format with nixfmt --- .../python-modules/app-model/default.nix | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/app-model/default.nix b/pkgs/development/python-modules/app-model/default.nix index d7fa932800a4..bf2130e22417 100644 --- a/pkgs/development/python-modules/app-model/default.nix +++ b/pkgs/development/python-modules/app-model/default.nix @@ -1,15 +1,16 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, hatch-vcs -, hatchling -, in-n-out -, psygnal -, pydantic -, pydantic-compat -, pytestCheckHook -, pythonOlder -, typing-extensions +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatch-vcs, + hatchling, + in-n-out, + psygnal, + pydantic, + pydantic-compat, + pytestCheckHook, + pythonOlder, + typing-extensions, }: buildPythonPackage rec { @@ -39,13 +40,9 @@ buildPythonPackage rec { typing-extensions ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "app_model" - ]; + pythonImportsCheck = [ "app_model" ]; meta = with lib; { description = "Module to implement generic application schema"; From d22297f52d287bd212c51583f740dc3d50f5d23c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 May 2024 14:53:45 +0200 Subject: [PATCH 04/13] python311Packages.napari-console: refactor --- .../development/python-modules/napari-console/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/napari-console/default.nix b/pkgs/development/python-modules/napari-console/default.nix index 9072ada93f42..f8cfe8bcb63d 100644 --- a/pkgs/development/python-modules/napari-console/default.nix +++ b/pkgs/development/python-modules/napari-console/default.nix @@ -13,22 +13,22 @@ buildPythonPackage rec { pname = "napari-console"; version = "0.0.7"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "napari"; - repo = pname; + repo = "napari-console"; rev = "refs/tags/v${version}"; hash = "sha256-vHLCVMgrcs54pGb48wQpc0h7QBIfE6r7hCSoDNI3QvA="; }; - nativeBuildInputs = [ + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ imageio ipykernel ipython From 7dc168a5d4690e9af4ab5207fce09a3ea16a6f92 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 May 2024 14:54:23 +0200 Subject: [PATCH 05/13] python311Packages.napari-console: 0.0.7 -> 0.0.9 Diff: https://github.com/napari/napari-console/compare/refs/tags/v0.0.7...v0.0.9 --- pkgs/development/python-modules/napari-console/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/napari-console/default.nix b/pkgs/development/python-modules/napari-console/default.nix index f8cfe8bcb63d..b4025e26667e 100644 --- a/pkgs/development/python-modules/napari-console/default.nix +++ b/pkgs/development/python-modules/napari-console/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "napari-console"; - version = "0.0.7"; + version = "0.0.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "napari"; repo = "napari-console"; rev = "refs/tags/v${version}"; - hash = "sha256-vHLCVMgrcs54pGb48wQpc0h7QBIfE6r7hCSoDNI3QvA="; + hash = "sha256-3gOfiPx06G5c4eaLQ5kP45hUr6yw91esznJFacpO66Q="; }; build-system = [ From a99f6f04f074bfe52167e5ed444046ce2418ba51 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 May 2024 14:54:46 +0200 Subject: [PATCH 06/13] python311Packages.napari-console: format with nixfmt --- .../python-modules/napari-console/default.nix | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/napari-console/default.nix b/pkgs/development/python-modules/napari-console/default.nix index b4025e26667e..ab1dcd12503b 100644 --- a/pkgs/development/python-modules/napari-console/default.nix +++ b/pkgs/development/python-modules/napari-console/default.nix @@ -1,13 +1,14 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, imageio -, ipykernel -, ipython -, napari-plugin-engine -, pythonOlder -, qtconsole -, setuptools-scm +{ + lib, + buildPythonPackage, + fetchFromGitHub, + imageio, + ipykernel, + ipython, + napari-plugin-engine, + pythonOlder, + qtconsole, + setuptools-scm, }: buildPythonPackage rec { @@ -24,9 +25,7 @@ buildPythonPackage rec { hash = "sha256-3gOfiPx06G5c4eaLQ5kP45hUr6yw91esznJFacpO66Q="; }; - build-system = [ - setuptools-scm - ]; + build-system = [ setuptools-scm ]; dependencies = [ imageio @@ -39,9 +38,7 @@ buildPythonPackage rec { # Circular dependency: napari doCheck = false; - pythonImportsCheck = [ - "napari_console" - ]; + pythonImportsCheck = [ "napari_console" ]; meta = with lib; { description = "A plugin that adds a console to napari"; From 9343603eae4fa57a3547dc6714528eba9da23e28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 May 2024 14:58:01 +0200 Subject: [PATCH 07/13] python311Packages.superqt: format with nixfmt --- .../python-modules/superqt/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index e7c3aaa04589..a7a585d97c56 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -1,17 +1,18 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, setuptools-scm -, pyqt5 -, qtpy -, typing-extensions -, pytestCheckHook -, pygments +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools-scm, + pyqt5, + qtpy, + typing-extensions, + pytestCheckHook, + pygments, }: buildPythonPackage rec { pname = "superqt"; - version = "0.3.8"; + version = "0.6.5"; format = "pyproject"; src = fetchFromGitHub { From 9a6840a19c7eb2fca7061c9c2d4f3d1c4df20663 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 May 2024 15:01:55 +0200 Subject: [PATCH 08/13] python311Packages.superqt: 0.3.8 -> 0.6.5 Diff: https://github.com/pyapp-kit/superqt/compare/refs/tags/v0.3.8...v0.6.5 Changelog: https://github.com/pyapp-kit/superqt/releases/tag/v0.6.5 --- .../python-modules/superqt/default.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index a7a585d97c56..d6e814974e84 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -2,33 +2,40 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools-scm, + hatch-vcs, + hatchling, pyqt5, qtpy, typing-extensions, pytestCheckHook, pygments, + pythonOlder, }: buildPythonPackage rec { pname = "superqt"; version = "0.6.5"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "napari"; - repo = pname; + owner = "pyapp-kit"; + repo = "superqt"; rev = "refs/tags/v${version}"; hash = "sha256-zEMG2zscGDlRxtLn/lUTEjZBPabcwzMcj/kMcy3yOs8="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + hatch-vcs + hatchling + ]; - propagatedBuildInputs = [ + dependencies = [ + pygments pyqt5 qtpy typing-extensions - pygments ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -40,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Missing widgets and components for Qt-python (napari/superqt)"; homepage = "https://github.com/napari/superqt"; + changelog = "https://github.com/pyapp-kit/superqt/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ SomeoneSerge ]; }; From fbcc96d8f2fb56bb275114dc3149b73076a9177f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 May 2024 15:09:14 +0200 Subject: [PATCH 09/13] python311Packages.superqt: add optional-dependencies --- .../python-modules/superqt/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index d6e814974e84..032c4e13bb49 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -4,12 +4,16 @@ fetchFromGitHub, hatch-vcs, hatchling, + pint, + pygments, pyqt5, + pyqt6, + pyside2, + pyside6, + pytestCheckHook, + pythonOlder, qtpy, typing-extensions, - pytestCheckHook, - pygments, - pythonOlder, }: buildPythonPackage rec { @@ -38,6 +42,13 @@ buildPythonPackage rec { typing-extensions ]; + passthru.optional-dependencies = { + quantity = [ pint ]; + pyside2 = [ pyside2 ]; + pyside6 = [ pyside6 ]; + pyqt6 = [ pyqt6 ]; + }; + nativeCheckInputs = [ pytestCheckHook ]; doCheck = false; # Segfaults... From 69b1f5cbc9dd7975b24def71b051ffd137a30fec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 May 2024 15:10:57 +0200 Subject: [PATCH 10/13] python312Packages.superqt: disable pythonImportsCheck Segmentation faults on Python 3.11 and 3.12 --- pkgs/development/python-modules/superqt/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index 032c4e13bb49..7012efc0e906 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -51,9 +51,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - doCheck = false; # Segfaults... + # Segmentation fault + doCheck = false; - pythonImportsCheck = [ "superqt" ]; + # Segmentation fault + # pythonImportsCheck = [ "superqt" ]; meta = with lib; { description = "Missing widgets and components for Qt-python (napari/superqt)"; From dfeec1af334043ae8c8a283adea3e8f28ef6c748 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 May 2024 15:20:30 +0200 Subject: [PATCH 11/13] python311Packages.napari-console: adjust inputs --- pkgs/development/python-modules/napari-console/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/napari-console/default.nix b/pkgs/development/python-modules/napari-console/default.nix index ab1dcd12503b..07b8d735736a 100644 --- a/pkgs/development/python-modules/napari-console/default.nix +++ b/pkgs/development/python-modules/napari-console/default.nix @@ -8,6 +8,7 @@ napari-plugin-engine, pythonOlder, qtconsole, + qtpy, setuptools-scm, }: @@ -28,11 +29,10 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; dependencies = [ - imageio ipykernel ipython - napari-plugin-engine qtconsole + qtpy ]; # Circular dependency: napari From 003b8ad60f7493c36497ae7adf95595acae1bc82 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 May 2024 15:21:18 +0200 Subject: [PATCH 12/13] napari: refactor --- .../python-modules/napari/default.nix | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 0bccb016570c..60812edd2801 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -1,7 +1,6 @@ { lib -, mkDerivationWith -, appdirs , app-model +, appdirs , buildPythonPackage , cachey , certifi @@ -11,21 +10,23 @@ , imageio , jsonschema , magicgui +, mkDerivationWith , napari-console , napari-npe2 , napari-svg , numpydoc +, pandas +, pillow , pint , psutil , pydantic , pyopengl -, pillow , pythonOlder , pyyaml , scikit-image , scipy +, setuptools , setuptools-scm -, sphinx , superqt , tifffile , toolz @@ -39,26 +40,28 @@ mkDerivationWith buildPythonPackage rec { pname = "napari"; version = "0.4.19.post1"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "napari"; - repo = pname; + repo = "napari"; rev = "refs/tags/v${version}"; hash = "sha256-qw5WdFPySNkmm+dNu+hqsmr+csBpHnSl9bMpb4nKEqI="; }; postPatch = '' substituteInPlace setup.cfg \ - --replace "scikit-image>=0.19.1" "scikit-image" \ - --replace "sphinx<5" "sphinx" \ - --replace "vispy>=0.11.0,<0.12" "vispy" + --replace-fail "scikit-image[data]>=0.19.1" "scikit-image" ''; - nativeBuildInputs = [ + build-system = [ + setuptools setuptools-scm + ]; + + nativeBuildInputs = [ wrapQtAppsHook ]; @@ -76,15 +79,15 @@ mkDerivationWith buildPythonPackage rec { napari-npe2 napari-svg numpydoc - pint + pandas pillow + pint psutil pydantic pyopengl pyyaml scikit-image scipy - sphinx superqt tifffile toolz From 8d17aaf690601e004c043908804ae1fb4e7c20b8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 May 2024 15:21:56 +0200 Subject: [PATCH 13/13] napari: format with nixfmt --- .../python-modules/napari/default.nix | 79 +++++++++---------- 1 file changed, 39 insertions(+), 40 deletions(-) diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 60812edd2801..b5baed96a441 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -1,40 +1,41 @@ -{ lib -, app-model -, appdirs -, buildPythonPackage -, cachey -, certifi -, dask -, docstring-parser -, fetchFromGitHub -, imageio -, jsonschema -, magicgui -, mkDerivationWith -, napari-console -, napari-npe2 -, napari-svg -, numpydoc -, pandas -, pillow -, pint -, psutil -, pydantic -, pyopengl -, pythonOlder -, pyyaml -, scikit-image -, scipy -, setuptools -, setuptools-scm -, superqt -, tifffile -, toolz -, tqdm -, typing-extensions -, vispy -, wrapQtAppsHook -, wrapt +{ + lib, + app-model, + appdirs, + buildPythonPackage, + cachey, + certifi, + dask, + docstring-parser, + fetchFromGitHub, + imageio, + jsonschema, + magicgui, + mkDerivationWith, + napari-console, + napari-npe2, + napari-svg, + numpydoc, + pandas, + pillow, + pint, + psutil, + pydantic, + pyopengl, + pythonOlder, + pyyaml, + scikit-image, + scipy, + setuptools, + setuptools-scm, + superqt, + tifffile, + toolz, + tqdm, + typing-extensions, + vispy, + wrapQtAppsHook, + wrapt, }: mkDerivationWith buildPythonPackage rec { @@ -61,9 +62,7 @@ mkDerivationWith buildPythonPackage rec { setuptools-scm ]; - nativeBuildInputs = [ - wrapQtAppsHook - ]; + nativeBuildInputs = [ wrapQtAppsHook ]; propagatedBuildInputs = [ app-model