Merge pull request #141347 from fabaff/bump-python-gvm

This commit is contained in:
Sandro 2021-10-12 11:29:05 +02:00 committed by GitHub
commit 82bf39bb5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 19 deletions

View File

@ -43,7 +43,14 @@ buildPythonPackage rec {
})
];
pythonImportsCheck = [ "gvmtools" ];
disabledTests = [
# Don't test sending
"SendTargetTestCase"
];
pythonImportsCheck = [
"gvmtools"
];
meta = with lib; {
description = "Collection of APIs that help with remote controlling a Greenbone Security Manager";

View File

@ -1,19 +1,18 @@
{ lib
, stdenv
, buildPythonPackage
, defusedxml
, fetchFromGitHub
, fetchpatch
, lxml
, paramiko
, poetry-core
, pytestCheckHook
, pythonOlder
, paramiko
, lxml
, defusedxml
}:
buildPythonPackage rec {
pname = "python-gvm";
version = "21.6.0";
version = "21.10.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +21,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = pname;
rev = "v${version}";
sha256 = "070qpj2y7834i50lhkkbv93s77j91js06zs1bpbmplppiraxqmyz";
sha256 = "sha256-6cNoeuB9449HB2/41VjazpSAGvaHmBjG/hqmBKX5FEA=";
};
nativeBuildInputs = [
@ -30,24 +29,15 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
paramiko
lxml
defusedxml
lxml
paramiko
];
checkInputs = [
pytestCheckHook
];
patches = [
# Switch to poetry-core, https://github.com/greenbone/python-gvm/pull/552
(fetchpatch {
name = "switch-to-poetry-core.patch";
url = "https://github.com/greenbone/python-gvm/commit/e48afa614ba9cf69d9b22ce1a4642c625acbaa06.patch";
sha256 = "0f5wfdymp5dcjk1xb7ynsf0g6idjg2ifwgggp4agic5nkh1k1inl";
})
];
disabledTests = [
# No running SSH available
"test_connect_error"
@ -55,7 +45,9 @@ buildPythonPackage rec {
"test_feed_xml_error"
];
pythonImportsCheck = [ "gvm" ];
pythonImportsCheck = [
"gvm"
];
meta = with lib; {
description = "Collection of APIs that help with remote controlling a Greenbone Security Manager";