From 2d05627c643040fb69759ab38af9b7d9dc315f8d Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 1 Nov 2024 01:50:43 +0900 Subject: [PATCH 1/3] python312Packages.ansitable: fix build --- pkgs/development/python-modules/ansitable/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/ansitable/default.nix b/pkgs/development/python-modules/ansitable/default.nix index ea6362b605d3..65be3068d7e8 100644 --- a/pkgs/development/python-modules/ansitable/default.nix +++ b/pkgs/development/python-modules/ansitable/default.nix @@ -7,6 +7,7 @@ colored, pytestCheckHook, numpy, + pandas, }: buildPythonPackage rec { @@ -30,6 +31,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook numpy + pandas ]; meta = with lib; { From da9da5f8bd9ab0c76a2900ba46b9a5e8ad62a43d Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 1 Nov 2024 01:51:03 +0900 Subject: [PATCH 2/3] python312Packages.ansitable: 0.11.2 -> 0.11.3 --- pkgs/development/python-modules/ansitable/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ansitable/default.nix b/pkgs/development/python-modules/ansitable/default.nix index 65be3068d7e8..e722d504d61f 100644 --- a/pkgs/development/python-modules/ansitable/default.nix +++ b/pkgs/development/python-modules/ansitable/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "ansitable"; - version = "0.11.2"; + version = "0.11.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MQ6VLjFDt/dEHDK8PbQsBdfzogJCm+pzyVYDbqkDOao="; + hash = "sha256-navayezkSSHgwOysC3fbgTQahRZjIV24JzIAQl+X5Jk="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ colored ]; + dependencies = [ colored ]; pythonImportsCheck = [ "ansitable" ]; From 3de49c67ac13d23492f7f99f3cf1204f4471e99d Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 13:34:49 +0900 Subject: [PATCH 3/3] python312Packages.spatialmath-python: 1.1.11 -> 1.1.13 --- .../spatialmath-python/default.nix | 35 ++++++++----------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/spatialmath-python/default.nix b/pkgs/development/python-modules/spatialmath-python/default.nix index 16c43e079c30..48314a348209 100644 --- a/pkgs/development/python-modules/spatialmath-python/default.nix +++ b/pkgs/development/python-modules/spatialmath-python/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchPypi, pythonOlder, @@ -10,18 +11,12 @@ numpy, scipy, typing-extensions, - coverage, - flake8, - pytest, - pytest-timeout, - pytest-xvfb, - sympy, pytestCheckHook, }: buildPythonPackage rec { pname = "spatialmath-python"; - version = "1.1.11"; + version = "1.1.13"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,17 +24,19 @@ buildPythonPackage rec { src = fetchPypi { pname = "spatialmath_python"; inherit version; - hash = "sha256-9EUlDGkpV/a73XWvrbtZLK8wrR8Am5EOkv3iSf9J4rM="; + hash = "sha256-BhIB4VapnARkzyhps8xRWnQTAlRB8aVPDpNuN/FNezo="; }; - nativeBuildInputs = [ + build-system = [ oldest-supported-numpy setuptools ]; pythonRemoveDeps = [ "pre-commit" ]; - propagatedBuildInputs = [ + pythonRelaxDeps = [ "matplotlib" ]; + + dependencies = [ ansitable matplotlib numpy @@ -47,21 +44,17 @@ buildPythonPackage rec { typing-extensions ]; - optional-dependencies = { - dev = [ - coverage - flake8 - pytest - pytest-timeout - pytest-xvfb - sympy - ]; - }; - pythonImportsCheck = [ "spatialmath" ]; nativeCheckInputs = [ pytestCheckHook ]; + disabledTestPaths = [ + # tests hang + "tests/test_spline.py" + ]; + + env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "Agg"; + meta = with lib; { description = "Provides spatial maths capability for Python"; homepage = "https://pypi.org/project/spatialmath-python/";