From 0146d9a5786b8a169fb2a22c3af0a2badb97a298 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Jun 2024 05:05:07 +0200 Subject: [PATCH] python3Packages.commoncode: 31.0.3 -> 31.2.1 https://github.com/nexB/commoncode/blob/v31.2.1/CHANGELOG.rst --- .../python-modules/commoncode/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 64be57156196..049cc4e09aa1 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -5,7 +5,7 @@ beautifulsoup4, buildPythonPackage, click, - fetchPypi, + fetchFromGitHub, pytest-xdist, pytestCheckHook, pythonAtLeast, @@ -18,14 +18,16 @@ buildPythonPackage rec { pname = "commoncode"; - version = "31.0.3"; + version = "31.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ura55/m/iesqN6kSYmdHB1sbthSHXaFWiQ76wVmyl0E="; + src = fetchFromGitHub { + owner = "nexB"; + repo = "commoncode"; + rev = "refs/tags/v${version}"; + hash = "sha256-4ZgyNlMj1i1fRru4wgDOyP3qzbne8D2eH/tFI60kgrE="; }; dontConfigure = true; @@ -46,6 +48,11 @@ buildPythonPackage rec { pytest-xdist ]; + preCheck = '' + # prevent readout of /etc/os-release during tests + sed -i "s/is_on_ubuntu_22()/lambda _: False/" src/commoncode/system.py + ''; + disabledTests = [ # chinese character translates different into latin