From 7d6a5def69846bd83ea13efaec3ad2f2dad28dbe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 11:24:43 +0100 Subject: [PATCH 1/4] python311Packages.pip-api: refactor --- .../python-modules/pip-api/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pip-api/default.nix b/pkgs/development/python-modules/pip-api/default.nix index 48edbf2480dc..b8a89ee623a1 100644 --- a/pkgs/development/python-modules/pip-api/default.nix +++ b/pkgs/development/python-modules/pip-api/default.nix @@ -1,25 +1,32 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pip , pretend , pytestCheckHook , pythonOlder +, setuptools , virtualenv }: buildPythonPackage rec { pname = "pip-api"; version = "0.0.30"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-oF3yx6qbcVc3S89Cc1RCAaDHuuYKnGW8+E85We84lvM="; + src = fetchFromGitHub { + owner = "di"; + repo = "pip-api"; + rev = "refs/tags/${version}"; + hash = "sha256-vl3CeVE0QdX2LsknpNg79s9IT0Qux63BreSXYLoDEcQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pip ]; @@ -46,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Importable pip API"; homepage = "https://github.com/di/pip-api"; + changelog = "https://github.com/di/pip-api/blob/${version}/CHANGELOG"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 06d91738f1c038222c7a5dda82672cf642295346 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 11:25:31 +0100 Subject: [PATCH 2/4] python312Packages.pip-api: 0.0.30 -> 0.0.31 Diff: https://github.com/di/pip-api/compare/refs/tags/0.0.30...0.0.31 Changelog: https://github.com/di/pip-api/blob/0.0.31/CHANGELOG --- pkgs/development/python-modules/pip-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip-api/default.nix b/pkgs/development/python-modules/pip-api/default.nix index b8a89ee623a1..c7819229ef16 100644 --- a/pkgs/development/python-modules/pip-api/default.nix +++ b/pkgs/development/python-modules/pip-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pip-api"; - version = "0.0.30"; + version = "0.0.31"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "di"; repo = "pip-api"; rev = "refs/tags/${version}"; - hash = "sha256-vl3CeVE0QdX2LsknpNg79s9IT0Qux63BreSXYLoDEcQ="; + hash = "sha256-WFyrEEfrGwsITYzQaukwmz5ml+I6zlMddINTkGeNUTM="; }; nativeBuildInputs = [ From 10184aaab0e17bfc8e478e6984b016795189eb55 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 12:03:56 +0100 Subject: [PATCH 3/4] python311Packages.ufo2ft: refactor --- .../python-modules/ufo2ft/default.nix | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index f0d517732805..b53b3bd27a04 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -1,28 +1,22 @@ { lib -, buildPythonPackage -, fetchPypi - -# build -, setuptools-scm - -# runtime , booleanoperations +, buildPythonPackage , cffsubr , compreffor , cu2qu , defcon +, fetchPypi , fonttools +, pytestCheckHook +, setuptools-scm , skia-pathops , ufolib2 - -# tests -, pytestCheckHook }: buildPythonPackage rec { pname = "ufo2ft"; version = "2.33.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -50,19 +44,22 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ + disabledTests = [ # Do not depend on skia. - "--deselect=tests/integration_test.py::IntegrationTest::test_removeOverlaps_CFF_pathops" - "--deselect=tests/integration_test.py::IntegrationTest::test_removeOverlaps_pathops" - "--deselect=tests/preProcessor_test.py::TTFPreProcessorTest::test_custom_filters_as_argument" - "--deselect=tests/preProcessor_test.py::TTFInterpolatablePreProcessorTest::test_custom_filters_as_argument" + "test_removeOverlaps_CFF_pathops" + "test_removeOverlaps_pathops" + "test_custom_filters_as_argument" + "test_custom_filters_as_argument" ]; - pythonImportsCheck = [ "ufo2ft" ]; + pythonImportsCheck = [ + "ufo2ft" + ]; meta = with lib; { description = "Bridge from UFOs to FontTools objects"; homepage = "https://github.com/googlefonts/ufo2ft"; + changelog = "https://github.com/googlefonts/ufo2ft/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; From 94a1edc8b25af87c7dcd55ba882038156cfb4bff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 12:08:19 +0100 Subject: [PATCH 4/4] python311Packages.ufo2ft: disable failing tests --- pkgs/development/python-modules/ufo2ft/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index b53b3bd27a04..6daa54a31e81 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -8,6 +8,7 @@ , fetchPypi , fonttools , pytestCheckHook +, pythonOlder , setuptools-scm , skia-pathops , ufolib2 @@ -18,6 +19,8 @@ buildPythonPackage rec { version = "2.33.4"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchPypi { inherit pname version; hash = "sha256-e6p/H1Vub0Ln0VhQvwsVLuD/p8uNG5oCPhfQPCTl1nY="; @@ -50,6 +53,11 @@ buildPythonPackage rec { "test_removeOverlaps_pathops" "test_custom_filters_as_argument" "test_custom_filters_as_argument" + # Some integration tests fail + "test_compileVariableCFF2" + "test_compileVariableTTF" + "test_drop_glyph_names_variable" + "test_drop_glyph_names_variable" ]; pythonImportsCheck = [