From 80f8748dd73fc3053dd5d60666d55aef561ffdda Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Aug 2024 02:21:56 +0000 Subject: [PATCH 1/3] python312Packages.axisregistry: 0.4.10 -> 0.4.11 --- pkgs/development/python-modules/axisregistry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/axisregistry/default.nix b/pkgs/development/python-modules/axisregistry/default.nix index 463d704cd654..371b234690a5 100644 --- a/pkgs/development/python-modules/axisregistry/default.nix +++ b/pkgs/development/python-modules/axisregistry/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "axisregistry"; - version = "0.4.10"; + version = "0.4.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-/N67VDr1ZFDRmZsxYCFT+KdUmc2ElgGNd8ljGWC5V0U="; + hash = "sha256-p1/ocmWqrCJ4CylRgen/DR0LeqcwIxB1jAauJbw8ygY="; }; propagatedBuildInputs = [ From 8ada17807f5c64f2af82bab1542811f91f4a935e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 Aug 2024 08:10:33 +0200 Subject: [PATCH 2/3] python312Packages.axisregistry: add changelog to meta --- pkgs/development/python-modules/axisregistry/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/axisregistry/default.nix b/pkgs/development/python-modules/axisregistry/default.nix index 371b234690a5..206dc39104e0 100644 --- a/pkgs/development/python-modules/axisregistry/default.nix +++ b/pkgs/development/python-modules/axisregistry/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Fonts registry of OpenType variation axis tags"; homepage = "https://github.com/googlefonts/axisregistry"; + changelog = "https://github.com/googlefonts/axisregistry/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ danc86 ]; }; From 6c29094a4dd243ae9a6fa5c57c92ddce027d953c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 Aug 2024 08:15:31 +0200 Subject: [PATCH 3/3] python312Packages.axisregistry: refactor - disable on unsupported Python releases - add pythonImportsCheck - update ordering --- .../python-modules/axisregistry/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/axisregistry/default.nix b/pkgs/development/python-modules/axisregistry/default.nix index 206dc39104e0..f4760c620076 100644 --- a/pkgs/development/python-modules/axisregistry/default.nix +++ b/pkgs/development/python-modules/axisregistry/default.nix @@ -6,35 +6,38 @@ protobuf, pytestCheckHook, setuptools-scm, + pythonOlder, }: buildPythonPackage rec { pname = "axisregistry"; version = "0.4.11"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-p1/ocmWqrCJ4CylRgen/DR0LeqcwIxB1jAauJbw8ygY="; }; - propagatedBuildInputs = [ - fonttools - protobuf - ]; - nativeBuildInputs = [ - setuptools-scm - ]; - - doCheck = true; - nativeCheckInputs = [ pytestCheckHook ]; - # Relax the dependency on protobuf 3. Other packages in the Google Fonts # ecosystem have begun upgrading from protobuf 3 to protobuf 4, # so we need to use protobuf 4 here as well to avoid a conflict # in the closure of fontbakery. It seems to be compatible enough. pythonRelaxDeps = [ "protobuf" ]; + build-system = [ setuptools-scm ]; + + dependencies = [ + fonttools + protobuf + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "axisregistry" ]; + meta = with lib; { description = "Google Fonts registry of OpenType variation axis tags"; homepage = "https://github.com/googlefonts/axisregistry";