From 5f29356038421e52d52bdf3e76b880dc10ba758a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Sep 2025 14:21:41 +0000 Subject: [PATCH 1/2] python3Packages.jproperties: 2.1.1 -> 2.1.2 --- pkgs/development/python-modules/jproperties/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jproperties/default.nix b/pkgs/development/python-modules/jproperties/default.nix index f629bdeaf4ba..6f8512b92d04 100644 --- a/pkgs/development/python-modules/jproperties/default.nix +++ b/pkgs/development/python-modules/jproperties/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "jproperties"; - version = "2.1.1"; + version = "2.1.2"; format = "setuptools"; src = fetchFromGitHub { owner = "Tblue"; repo = "python-jproperties"; rev = "v${version}"; - hash = "sha256-O+ALeGHMNjW1dc9IRyLzO81k8DW2vbGjuZqXxgrhYjo="; + hash = "sha256-wnhEcPWAFUXR741/LZT3TXqxrU70JZe+90AkVEA3A+k="; }; nativeBuildInputs = [ setuptools-scm ]; From d1461bacd2d7031991045e55fb74e5eab8a9575c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 Sep 2025 20:39:58 +0200 Subject: [PATCH 2/2] python313Packages.jproperties: modernize --- .../python-modules/jproperties/default.nix | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/jproperties/default.nix b/pkgs/development/python-modules/jproperties/default.nix index 6f8512b92d04..1705f73d2605 100644 --- a/pkgs/development/python-modules/jproperties/default.nix +++ b/pkgs/development/python-modules/jproperties/default.nix @@ -6,24 +6,33 @@ six, pytest-cov-stub, pytest-datadir, + setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "jproperties"; version = "2.1.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Tblue"; repo = "python-jproperties"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-wnhEcPWAFUXR741/LZT3TXqxrU70JZe+90AkVEA3A+k="; }; - nativeBuildInputs = [ setuptools-scm ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "setuptools_scm ~= 3.3" "setuptools_scm" + ''; - propagatedBuildInputs = [ six ]; + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ six ]; nativeCheckInputs = [ pytest-cov-stub @@ -31,11 +40,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "setuptools_scm ~= 3.3" "setuptools_scm" - ''; - disabledTestPaths = [ # TypeError: 'PosixPath' object... "tests/test_simple_utf8.py" @@ -45,9 +49,9 @@ buildPythonPackage rec { meta = with lib; { description = "Java Property file parser and writer for Python"; - mainProgram = "propconv"; homepage = "https://github.com/Tblue/python-jproperties"; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainers = with maintainers; [ fab ]; + mainProgram = "propconv"; }; }