Merge branch 'refs/heads/white/dev' into white/staging

infobyte · Jan 6, 2025 · d54a0b7 · d54a0b7
2 parents 9cd029d + 0d38a4a
commit d54a0b7
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 21 deletions.
diff --git a/CHANGELOG/5.10.0/community.md b/CHANGELOG/5.10.0/community.md
@@ -0,0 +1,3 @@
+ * [ADD] CVSS4 data is now included in CSV exports. #7850
+ * [ADD] Added support for CVSS v4 in bulk imports. #7849
+ * [FIX] Added authorization to the config endpoint. #7331
diff --git a/CHANGELOG/5.10.0/date.md b/CHANGELOG/5.10.0/date.md
@@ -0,0 +1 @@
+Jan 6th, 2025
diff --git a/CHANGELOG/current/7331.json b/CHANGELOG/current/7331.json
diff --git a/CHANGELOG/current/7849.json b/CHANGELOG/current/7849.json
diff --git a/CHANGELOG/current/7850.json b/CHANGELOG/current/7850.json
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,6 +1,12 @@
 New features in the latest update
 =====================================
 
+5.10.0 [Jan 6th, 2025]:
+---
+ * [ADD] CVSS4 data is now included in CSV exports. #7850
+ * [ADD] Added support for CVSS v4 in bulk imports. #7849
+ * [FIX] Added authorization to the config endpoint. #7331
+
 5.9.0 [Nov 21st, 2024]:
 ---
  * [ADD] Added more validations to attachments. #7851

diff --git a/faraday/__init__.py b/faraday/__init__.py
@@ -4,4 +4,4 @@
 See the file 'doc/LICENSE' for the license information
 """
 
-__version__ = '5.9.0'
+__version__ = '5.10.0'
diff --git a/faraday/openapi/faraday_swagger.json b/faraday/openapi/faraday_swagger.json
@@ -1,7 +1,7 @@
 {
     "info": {
         "description": "The Faraday REST API enables you to interact with [our server](https://github.com/infobyte/faraday).\nUse this API to interact or integrate with Faraday server. This page documents the REST API, with HTTP response codes and example requests and responses.",
-        "title": "Faraday 5.9.0 API",
+        "title": "Faraday 5.10.0 API",
         "version": "v3"
     },
     "security": [

diff --git a/pynixify/packages/faraday-agent-parameters-types/default.nix b/pynixify/packages/faraday-agent-parameters-types/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "faraday-agent-parameters-types";
-  version = "1.7.2";
+  version = "1.7.3";
 
   src = fetchPypi {
     inherit version;
     pname = "faraday_agent_parameters_types";
-    sha256 = "1zh9zn4qdhy5fms61rmld3jz4gry6g1k4kmjbjwssk28nhcirszp";
+    sha256 = "1xp0gyds9f5q9qb39vzbpgv924k1aabpclhdajzyzvb846c334vn";
   };
 
   buildInputs = [ pytest-runner ];

diff --git a/pynixify/packages/faraday-plugins/default.nix b/pynixify/packages/faraday-plugins/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "faraday-plugins";
-  version = "1.20.0";
+  version = "1.21.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ghlikg4j5bzff9qiq0skbbpj8r9lyqx5bka35ybwh7qwsv7y90p";
+    sha256 = "1bdwnv9c54dmqbb5l9nm5f69n2gjkslk8wy39ma1xjk5wc3nm4nk";
   };
 
   propagatedBuildInputs = [

diff --git a/pynixify/packages/faradaysec/default.nix b/pynixify/packages/faradaysec/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "faradaysec";
-  version = "5.9.0";
+  version = "5.10.0";
 
   src = lib.cleanSource ../../..;
 

diff --git a/requirements.txt b/requirements.txt
@@ -36,7 +36,7 @@ syslog-rfc5424-formatter>=1.1.1
 simplekv>=0.13.0
 Flask-KVSession-fork>=0.6.4
 distro>=1.4.0
-faraday-plugins>=1.20.0,<2.0.0
+faraday-plugins>=1.21.0,<2.0.0
 apispec>=6.3.0
 apispec-webframeworks<=0.5.2
 pyyaml
@@ -45,7 +45,7 @@ Flask-SocketIO>=5.0.1
 pyotp>=2.6.0
 Flask-Limiter>=1.3.1,<1.4.0
 Flask-Mail
-faraday-agent-parameters-types>=1.7.2
+faraday-agent-parameters-types>=1.7.3
 cvss>=3.1
 celery>=5.2.7
 gevent>=22.10.2