From 0f27c8a4ac5ce085fb1989dd0ea421b758ff8b9b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 6 Apr 2024 10:25:24 +0200 Subject: [PATCH 1/2] python312Packages.semver: refactor --- .../python-modules/semver/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 7260baa5aa10..29a0a2abc1ae 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "semver"; version = "3.0.2"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,12 @@ buildPythonPackage rec { hash = "sha256-772PSUq1dqtn9aOol+Bo0S0OItBmoiCNP8q/YCBvKU4="; }; - nativeBuildInputs = [ + postPatch = '' + sed -i "/--cov/d" setup.cfg + sed -i "/--no-cov-on-fail/d" setup.cfg + ''; + + build-system = [ setuptools setuptools-scm ]; @@ -30,11 +35,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - sed -i "/--cov/d" setup.cfg - sed -i "/--no-cov-on-fail/d" setup.cfg - ''; - disabledTestPaths = [ # Don't test the documentation "docs/*.rst" @@ -46,10 +46,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to work with Semantic Versioning (http://semver.org/)"; - mainProgram = "pysemver"; homepage = "https://python-semver.readthedocs.io/"; changelog = "https://github.com/python-semver/python-semver/releases/tag/3.0.0"; license = licenses.bsd3; maintainers = with maintainers; [ np ]; + mainProgram = "pysemver"; }; } From 44f7c4cac1f8eea1f09cfec56a0d78f19818a92d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 6 Apr 2024 10:25:57 +0200 Subject: [PATCH 2/2] python312Packages.semver: format with nixfmt --- .../python-modules/semver/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 29a0a2abc1ae..cb2ed61307b3 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -1,10 +1,11 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, setuptools -, setuptools-scm +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, + setuptools-scm, }: buildPythonPackage rec { @@ -31,18 +32,14 @@ buildPythonPackage rec { setuptools-scm ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ # Don't test the documentation "docs/*.rst" ]; - pythonImportsCheck = [ - "semver" - ]; + pythonImportsCheck = [ "semver" ]; meta = with lib; { description = "Python package to work with Semantic Versioning (http://semver.org/)";