From a6e454f2c097ad761c23120fa709091abafeac7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 23:52:33 +0000 Subject: [PATCH 1/3] fontbakery: 0.12.7 -> 0.12.9 --- pkgs/development/python-modules/fontbakery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fontbakery/default.nix b/pkgs/development/python-modules/fontbakery/default.nix index 5d0f5d6dcaef..aa9d924083ed 100644 --- a/pkgs/development/python-modules/fontbakery/default.nix +++ b/pkgs/development/python-modules/fontbakery/default.nix @@ -46,11 +46,11 @@ buildPythonPackage rec { pname = "fontbakery"; - version = "0.12.7"; + version = "0.12.9"; src = fetchPypi { inherit pname version; - hash = "sha256-7cZeazEyAyU+WDop2n7wneg2wzh+9U9atKSRcreJpGw="; + hash = "sha256-Cl0jRQqF83IIldkp1VuVSS4ZeVsQH1NNpyEkpMJqhA8="; }; pyproject = true; From 5e1ec7c5f50386b8c10b2e883093c3c764065dc3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 5 Aug 2024 08:22:53 +0200 Subject: [PATCH 2/3] python312Packages.fontbakery: add changelog to meta --- pkgs/development/python-modules/fontbakery/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/fontbakery/default.nix b/pkgs/development/python-modules/fontbakery/default.nix index aa9d924083ed..ccb0049a1ea6 100644 --- a/pkgs/development/python-modules/fontbakery/default.nix +++ b/pkgs/development/python-modules/fontbakery/default.nix @@ -145,6 +145,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool for checking the quality of font projects"; homepage = "https://github.com/googlefonts/fontbakery"; + changelog = "https://github.com/fonttools/fontbakery/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ danc86 ]; }; From 7e26005c71f832aba34b8776e17840346f6fae0b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 5 Aug 2024 08:28:47 +0200 Subject: [PATCH 3/3] python312Packages.fontbakery: refactor - disable on unsupported Python releases - update ordering for easier reviewing --- .../python-modules/fontbakery/default.nix | 61 ++++++++++--------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/pkgs/development/python-modules/fontbakery/default.nix b/pkgs/development/python-modules/fontbakery/default.nix index ccb0049a1ea6..c875392e62f3 100644 --- a/pkgs/development/python-modules/fontbakery/default.nix +++ b/pkgs/development/python-modules/fontbakery/default.nix @@ -1,59 +1,76 @@ { lib, - buildPythonPackage, - callPackage, - fetchPypi, axisregistry, babelfont, beautifulsoup4, beziers, + buildPythonPackage, + callPackage, cmarkgfm, collidoscope, defcon, dehinter, - fonttools, + fetchPypi, font-v, + fonttools, freetype-py, gflanguages, gfsubsets, git, glyphsets, - lxml, installShellFiles, jinja2, + lxml, munkres, opentypespec, ots-python, packaging, pip-api, protobuf, - pytestCheckHook, pytest-xdist, + pytestCheckHook, + pythonOlder, pyyaml, - requests, requests-mock, + requests, rich, - setuptools, setuptools-scm, + setuptools, shaperglot, stringbrewer, toml, - unicodedata2, ufo2ft, ufolint, + unicodedata2, vharfbuzz, }: buildPythonPackage rec { pname = "fontbakery"; version = "0.12.9"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; hash = "sha256-Cl0jRQqF83IIldkp1VuVSS4ZeVsQH1NNpyEkpMJqhA8="; }; - pyproject = true; + pythonRelaxDeps = [ + "collidoscope" + "protobuf" + "vharfbuzz" + ]; + + build-system = [ + setuptools + setuptools-scm + ]; + + nativeBuildInputs = [ + installShellFiles + ]; dependencies = [ axisregistry @@ -64,17 +81,17 @@ buildPythonPackage rec { collidoscope defcon dehinter - fonttools font-v + fonttools freetype-py gflanguages gfsubsets glyphsets - lxml jinja2 + lxml munkres - ots-python opentypespec + ots-python packaging pip-api protobuf @@ -84,26 +101,12 @@ buildPythonPackage rec { shaperglot stringbrewer toml + ufo2ft ufolint unicodedata2 vharfbuzz - ufo2ft - ]; - build-system = [ - setuptools - setuptools-scm - ]; - nativeBuildInputs = [ - installShellFiles ]; - pythonRelaxDeps = [ - "collidoscope" - "protobuf" - "vharfbuzz" - ]; - - doCheck = true; nativeCheckInputs = [ git pytestCheckHook @@ -111,6 +114,7 @@ buildPythonPackage rec { requests-mock ufolint ]; + preCheck = '' # Let the tests invoke 'fontbakery' command. export PATH="$out/bin:$PATH" @@ -121,6 +125,7 @@ buildPythonPackage rec { git config user.name Test git commit --allow-empty --message 'Dummy commit for tests' ''; + disabledTests = [ # These require network access: "test_check_description_broken_links"