python3Packages.{tenable,faraday-agent-parameters-types},faraday-agent-dispatcher: fix build (#499385)

pkgs/by-name/fa/faraday-agent-dispatcher/package.nix

@@ -6,29 +6,36 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "faraday-agent-dispatcher";
-  version = "3.4.2";
+  version = "3.9.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "infobyte";
     repo = "faraday_agent_dispatcher";
     tag = finalAttrs.version;
-    hash = "sha256-Qr3ZGU4y7f6yHD78ecdv7a6IBFDpT+/4Yez0n/MenN0=";
+    hash = "sha256-uf1oXE8pFvIPTDgcHXRbZDz8NZn9NecPe1eYuYhb1Xw=";
   };
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace-fail '"pytest-runner",' ""
-  '';
+      --replace-fail '"pytest-runner",' ""  '';
 
   pythonRelaxDeps = [
     "python-socketio"
   ];
 
+  pythonRemoveDeps = [
+    "python-owasp-zap-v2.4"
+  ];
+
   build-system = with python3.pkgs; [
     setuptools-scm
   ];
 
+  nativeBuildInputs = [
+    python3.pkgs.python-owasp-zap-v2-4
+  ];
+
   dependencies = with python3.pkgs; [
     aiohttp
     click
@@ -42,6 +49,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     python-socketio
     pyyaml
     requests
+    requests-ratelimiter
     syslog-rfc5424-formatter
     websockets
   ];

pkgs/development/python-modules/faraday-agent-parameters-types/default.nix

@@ -1,23 +1,43 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  marshmallow,
+  fetchFromGitHub,
+  flit-core,
   packaging,
   pytestCheckHook,
   setuptools,
   validators,
 }:
+let
+  marshmallow' = buildPythonPackage {
+    pname = "marshmallow";
+    version = "3.26.2";
+    pyproject = true;
 
-buildPythonPackage rec {
+    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";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "faraday_agent_parameters_types";
-    inherit version;
-    hash = "sha256-PWO4wufHGIgAi1BHoM/+6ZjsUDB4oY26NsHOdNYYTJc=";
+  src = fetchFromGitHub {
+    owner = "infobyte";
+    repo = "faraday_agent_parameters_types";
+    tag = finalAttrs.version;
+    hash = "sha256-Oe/9/zKOoCLK3JHMacOhk2+d91MrhzkBTW3POoFm71M=";
   };
 
   pythonRelaxDeps = [ "validators" ];
@@ -30,7 +50,7 @@ buildPythonPackage rec {
   build-system = [ setuptools ];
 
   dependencies = [
-    marshmallow
+    marshmallow'
     packaging
     validators
   ];
@@ -50,8 +70,8 @@ buildPythonPackage rec {
   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/${version}/CHANGELOG.md";
+    changelog = "https://github.com/infobyte/faraday_agent_parameters_types/blob/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

pkgs/development/python-modules/pytenable/default.nix

@@ -1,31 +1,58 @@
 {
   lib,
   buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   cryptography,
   defusedxml,
-  fetchFromGitHub,
   gql,
   graphql-core,
-  marshmallow,
-  pydantic-extra-types,
   pydantic,
+  pydantic-extra-types,
+  python-box,
+  python-dateutil,
+  requests,
+  requests-toolbelt,
+  restfly,
+  semver,
+  typing-extensions,
+
+  # marshmallow build system
+  flit-core,
+
+  # tests
   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;
 
-buildPythonPackage rec {
+    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.0";
   pyproject = true;
@@ -33,7 +60,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tenable";
     repo = "pyTenable";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-ml5364D3qvd6VNhF2JyGoCzxbdO0DBkaBMoD38O5x8o=";
   };
 
@@ -49,7 +76,7 @@ buildPythonPackage rec {
     defusedxml
     gql
     graphql-core
-    marshmallow
+    marshmallow'
     pydantic
     pydantic-extra-types
     python-box
@@ -70,6 +97,10 @@ buildPythonPackage rec {
     responses
   ];
 
+  pytestFlags = [
+    "-Wignore::pytest.PytestRemovedIn9Warning"
+  ];
+
   disabledTestPaths = [
     # Disable tests that requires network access
     "tests/io/"
@@ -98,8 +129,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for the Tenable.io and TenableSC API";
     homepage = "https://github.com/tenable/pyTenable";
-    changelog = "https://github.com/tenable/pyTenable/releases/tag/${src.tag}";
+    changelog = "https://github.com/tenable/pyTenable/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})