From 3d4570836c526bbac20ff3c5c9ff3a2102fb92c0 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 29 Aug 2023 10:30:21 -0700 Subject: [PATCH 1/2] python310Packages.dunamai: 1.16.0 -> 1.18.0 --- pkgs/development/python-modules/dunamai/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix index 87ff45fb468e4..46e2361d9db99 100644 --- a/pkgs/development/python-modules/dunamai/default.nix +++ b/pkgs/development/python-modules/dunamai/default.nix @@ -6,13 +6,12 @@ , importlib-metadata , packaging , pytestCheckHook -, setuptools , git }: buildPythonPackage rec { pname = "dunamai"; - version = "1.16.0"; + version = "1.18.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +20,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = "dunamai"; rev = "refs/tags/v${version}"; - hash = "sha256-pPUn+1rv76N/7WVDyWJLPVMweJ1Qbx6/P4zIKU06hSs="; + hash = "sha256-QKXEFwOAa5nIQZA6DHNqnWyshnN+/6qovdqjCd9WF4k="; }; nativeBuildInputs = [ @@ -46,7 +45,11 @@ buildPythonPackage rec { nativeCheckInputs = [ git pytestCheckHook - setuptools + ]; + + disabledTests = [ + # clones from github.com + "test__version__from_git__shallow" ]; pythonImportsCheck = [ From b522470d14812144f6d317d2c356e99e1ff8ceff Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 29 Aug 2023 10:30:42 -0700 Subject: [PATCH 2/2] python310Packages.poetry-dynamic-versioning: 0.21.5 -> 1.0.1 --- .../python-modules/poetry-dynamic-versioning/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index 625cd6ab9148a..9c6440cd4c326 100644 --- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix @@ -3,7 +3,6 @@ , dunamai , fetchFromGitHub , jinja2 -, markupsafe , poetry-core , poetry , pytestCheckHook @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "poetry-dynamic-versioning"; - version = "0.21.5"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YFbIQLIbedErdKiPlZf0+6qtZexuJ6Q6pzhy54vSK5Y="; + hash = "sha256-BGAo3c0TzyhIiDtZjoEP+Eeu51WJB3Wg71poFMWJ+VM="; }; nativeBuildInputs = [ @@ -32,7 +31,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ dunamai jinja2 - markupsafe tomlkit ];