From 41f513ee7337c48709ee6658ada0870369110529 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Dec 2023 13:10:10 +0000 Subject: [PATCH 1/2] python311Packages.opentsne: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/opentsne/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opentsne/default.nix b/pkgs/development/python-modules/opentsne/default.nix index 9fc3c7fe8143..c01994a0260b 100644 --- a/pkgs/development/python-modules/opentsne/default.nix +++ b/pkgs/development/python-modules/opentsne/default.nix @@ -15,14 +15,14 @@ let self = buildPythonPackage rec { pname = "opentsne"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "pavlin-policar"; repo = "openTSNE"; rev = "v${version}"; - hash = "sha256-L5Qx6dMJlXF3EaWwlFTQ3dkhGXc5PvQBXYJo+QO+Hxc="; + hash = "sha256-UTfEjjNz1mm5fhyTw9GRlMNURwWlr6kLMjrMngkFV3Y="; }; nativeBuildInputs = [ From 303a0a0bc0ddb621f45c2dbe8829ce20015bd2ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 1 Dec 2023 14:25:16 +0100 Subject: [PATCH 2/2] python311Packages.opentsne: refactor --- .../python-modules/opentsne/default.nix | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/opentsne/default.nix b/pkgs/development/python-modules/opentsne/default.nix index c01994a0260b..ba3e0b8460b1 100644 --- a/pkgs/development/python-modules/opentsne/default.nix +++ b/pkgs/development/python-modules/opentsne/default.nix @@ -7,7 +7,7 @@ , scipy , scikit-learn , pytestCheckHook -, nix-update-script +, pythonOlder , setuptools , wheel }: @@ -16,12 +16,14 @@ let self = buildPythonPackage rec { pname = "opentsne"; version = "1.0.1"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pavlin-policar"; repo = "openTSNE"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-UTfEjjNz1mm5fhyTw9GRlMNURwWlr6kLMjrMngkFV3Y="; }; @@ -32,13 +34,19 @@ let wheel ]; - propagatedBuildInputs = [ numpy scipy scikit-learn ]; + propagatedBuildInputs = [ + numpy + scipy + scikit-learn + ]; + + pythonImportsCheck = [ + "openTSNE" + ]; - pythonImportsCheck = [ "openTSNE" ]; doCheck = false; passthru = { - updateScript = nix-update-script {}; tests.pytest = self.overridePythonAttrs (old: { pname = "${old.pname}-tests"; format = "other"; @@ -53,12 +61,12 @@ let }); }; - meta = { + meta = with lib; { description = "Modular Python implementation of t-Distributed Stochasitc Neighbor Embedding"; homepage = "https://github.com/pavlin-policar/openTSNE"; - changelog = "https://github.com/pavlin-policar/openTSNE/releases/tag/${version}"; - license = [ lib.licenses.bsd3 ]; - maintainers = [ lib.maintainers.lucasew ]; + changelog = "https://github.com/pavlin-policar/openTSNE/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ lucasew ]; }; }; in self