python3Packages.pytenable: 1.9.1 -> 26.5.1 (#525478)

This commit is contained in:
Fabian Affolter 2026-07-01 21:24:12 +00:00 committed by GitHub
commit 9bf0dc073b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 34 additions and 82 deletions

View file

@ -17,6 +17,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
};
pythonRelaxDeps = [
"pytenable"
"typer"
"validators"
];

View file

@ -2,6 +2,7 @@
lib,
fetchFromGitHub,
python3,
writableTmpDirAsHomeHook,
}:
python3.pkgs.buildPythonApplication (finalAttrs: {
@ -21,6 +22,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
--replace-fail '"pytest-runner",' "" '';
pythonRelaxDeps = [
"pytenable"
"python-socketio"
];
@ -28,13 +30,9 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
"python-owasp-zap-v2.4"
];
build-system = with python3.pkgs; [
setuptools-scm
];
build-system = with python3.pkgs; [ setuptools-scm ];
nativeBuildInputs = [
python3.pkgs.python-owasp-zap-v2-4
];
nativeBuildInputs = with python3.pkgs; [ python-owasp-zap-v2-4 ];
dependencies = with python3.pkgs; [
aiohttp
@ -57,12 +55,9 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
nativeCheckInputs = with python3.pkgs; [
pytest-asyncio
pytestCheckHook
writableTmpDirAsHomeHook
];
preCheck = ''
export HOME=$(mktemp -d);
'';
disabledTests = [
"test_execute_agent"
"SSL"
@ -74,14 +69,12 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
"tests/unittests/test_import_official_executors.py"
];
pythonImportsCheck = [
"faraday_agent_dispatcher"
];
pythonImportsCheck = [ "faraday_agent_dispatcher" ];
meta = {
description = "Tool to send result from tools to the Faraday Platform";
homepage = "https://github.com/infobyte/faraday_agent_dispatcher";
changelog = "https://github.com/infobyte/faraday_agent_dispatcher/releases/tag/${finalAttrs.version}";
changelog = "https://github.com/infobyte/faraday_agent_dispatcher/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "faraday-dispatcher";

View file

@ -3,31 +3,13 @@
buildPythonPackage,
fetchFromGitHub,
flit-core,
marshmallow,
packaging,
pytestCheckHook,
setuptools,
validators,
}:
let
marshmallow' = buildPythonPackage {
pname = "marshmallow";
version = "3.26.2";
pyproject = true;
src = fetchFromGitHub {
owner = "marshmallow-code";
repo = "marshmallow";
tag = "3.26.2";
hash = "sha256-ioe+aZHOW8r3wF3UknbTjAP0dEggd/NL9PTkPVQ46zM=";
};
build-system = [ flit-core ];
doCheck = false;
pythonImportsCheck = [ "marshmallow" ];
};
in
buildPythonPackage (finalAttrs: {
pname = "faraday-agent-parameters-types";
version = "1.9.1";
@ -40,7 +22,10 @@ buildPythonPackage (finalAttrs: {
hash = "sha256-Oe/9/zKOoCLK3JHMacOhk2+d91MrhzkBTW3POoFm71M=";
};
pythonRelaxDeps = [ "validators" ];
pythonRelaxDeps = [
"marshmallow"
"validators"
];
postPatch = ''
substituteInPlace setup.py \
@ -50,7 +35,7 @@ buildPythonPackage (finalAttrs: {
build-system = [ setuptools ];
dependencies = [
marshmallow'
marshmallow
packaging
validators
];
@ -65,12 +50,16 @@ buildPythonPackage (finalAttrs: {
disabledTests = [
# assert 'Version requested not valid' in "Invalid version: 'hola'"
"test_incorrect_version_requested"
# Tests are outdated
"test_deserialize"
"test_invalid_data"
"test_serialize"
];
meta = {
description = "Collection of Faraday agent parameters types";
homepage = "https://github.com/infobyte/faraday_agent_parameters_types";
changelog = "https://github.com/infobyte/faraday_agent_parameters_types/blob/${finalAttrs.version}/CHANGELOG.md";
changelog = "https://github.com/infobyte/faraday_agent_parameters_types/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ fab ];
};

View file

@ -1,74 +1,42 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
setuptools,
# dependencies
cryptography,
defusedxml,
fetchFromGitHub,
gql,
graphql-core,
pydantic,
marshmallow,
pydantic-extra-types,
python-box,
python-dateutil,
requests,
requests-toolbelt,
restfly,
semver,
typing-extensions,
# marshmallow build system
flit-core,
# tests
pydantic,
pytest-cov-stub,
pytest-datafiles,
pytest-vcr,
pytestCheckHook,
python-box,
python-dateutil,
requests-pkcs12,
requests-toolbelt,
requests,
responses,
restfly,
semver,
setuptools,
typing-extensions,
}:
let
marshmallow' = buildPythonPackage {
pname = "marshmallow";
version = "3.26.2";
pyproject = true;
src = fetchFromGitHub {
owner = "marshmallow-code";
repo = "marshmallow";
tag = "3.26.2";
hash = "sha256-ioe+aZHOW8r3wF3UknbTjAP0dEggd/NL9PTkPVQ46zM=";
};
build-system = [ flit-core ];
doCheck = false;
pythonImportsCheck = [ "marshmallow" ];
};
in
buildPythonPackage (finalAttrs: {
pname = "pytenable";
version = "1.9.1";
version = "26.5.1";
pyproject = true;
src = fetchFromGitHub {
owner = "tenable";
repo = "pyTenable";
tag = finalAttrs.version;
hash = "sha256-WAKZe1m6EaNE+y2B/1/k8qZsEftLfAVPVEvIkh2N/4g=";
hash = "sha256-o11Lq11btpIwzgZlPMcChHexNOZSFEFOsnaIv1n66uY=";
};
pythonRelaxDeps = [
"cryptography"
"defusedxml"
];
build-system = [ setuptools ];
dependencies = [
@ -76,7 +44,7 @@ buildPythonPackage (finalAttrs: {
defusedxml
gql
graphql-core
marshmallow'
marshmallow
pydantic
pydantic-extra-types
python-box
@ -115,6 +83,7 @@ buildPythonPackage (finalAttrs: {
# Test requires network access
"test_assets_list_vcr"
"test_events_list_vcr"
"test_session_ssl_error"
# https://github.com/tenable/pyTenable/issues/953
"test_construct_query_str"
"test_construct_query_stored_file"