From 42ba7dfbef884198746a9af6a34510b9ef727ff2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 May 2024 15:24:11 +0000 Subject: [PATCH 1/3] python311Packages.pycomposefile: 0.0.30 -> 0.0.31 --- pkgs/development/python-modules/pycomposefile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycomposefile/default.nix b/pkgs/development/python-modules/pycomposefile/default.nix index 2789fbb69d22..b504506c42b5 100644 --- a/pkgs/development/python-modules/pycomposefile/default.nix +++ b/pkgs/development/python-modules/pycomposefile/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pycomposefile"; - version = "0.0.30"; + version = "0.0.31"; format = "setuptools"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-GQopIO8F+G5iDz4NF2GTHCpXo4uqKHdHIzffacihylM="; + hash = "sha256-SYul81giQLUM1FdgfabKJyrbSu4xdoaWblcE87ZbBwg="; }; nativeBuildInput = [ From f255e6b7276b24b5005a3d4e4bafe20b24bdf6ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 09:30:43 +0200 Subject: [PATCH 2/3] python312Packages.pycomposefile: refactor --- .../python-modules/pycomposefile/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pycomposefile/default.nix b/pkgs/development/python-modules/pycomposefile/default.nix index b504506c42b5..cc995e796638 100644 --- a/pkgs/development/python-modules/pycomposefile/default.nix +++ b/pkgs/development/python-modules/pycomposefile/default.nix @@ -1,36 +1,42 @@ { lib , buildPythonPackage , fetchPypi -, setuptools , pyyaml -, twine +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pycomposefile"; version = "0.0.31"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - extension = "tar.gz"; hash = "sha256-SYul81giQLUM1FdgfabKJyrbSu4xdoaWblcE87ZbBwg="; }; - nativeBuildInput = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pyyaml - twine ]; - doCheck = false; # tests are broken + # Tests are broken + doCheck = false; + + pythonImportsCheck = [ + "pycomposefile" + ]; meta = with lib; { description = "Python library for structured deserialization of Docker Compose files"; homepage = "https://github.com/smurawski/pycomposefile"; + changelog = "https://github.com/smurawski/pycomposefile/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ mdarocha ]; }; From b51ff963a04886b2a1bd403f9fac4fe40e526ea3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 09:31:29 +0200 Subject: [PATCH 3/3] python312Packages.pycomposefile: format with nixfmt --- .../python-modules/pycomposefile/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pycomposefile/default.nix b/pkgs/development/python-modules/pycomposefile/default.nix index cc995e796638..9ede18903450 100644 --- a/pkgs/development/python-modules/pycomposefile/default.nix +++ b/pkgs/development/python-modules/pycomposefile/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pyyaml -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + pyyaml, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -18,20 +19,14 @@ buildPythonPackage rec { hash = "sha256-SYul81giQLUM1FdgfabKJyrbSu4xdoaWblcE87ZbBwg="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - pyyaml - ]; + dependencies = [ pyyaml ]; # Tests are broken doCheck = false; - pythonImportsCheck = [ - "pycomposefile" - ]; + pythonImportsCheck = [ "pycomposefile" ]; meta = with lib; { description = "Python library for structured deserialization of Docker Compose files";