Merge pull request #4559 from wazuh/fix/wj5695-revert-3760-setuptools…

…-dep

Revert "Pull request #3788 from wazuh/3760-setuptools-dep" in 4.8.0

CHANGELOG.md

@@ -127,7 +127,6 @@ Release report: https:/wazuh/wazuh/issues/19111
 
 ### Changed
 
-- Update setuptools dependency ([#3788](https:/wazuh/wazuh-qa/pull/3788))
 - Update the cluster master logs reliability test to run with python 3.7 [#4445](https:/wazuh/wazuh-qa/pull/4478) \- (Tests)
 - Update ITs URL for SUSE OVAL ([#4496](https:/wazuh/wazuh-qa/pull/4496/))
 

deps/wazuh_testing/setup.py

@@ -2,8 +2,8 @@
 # Created by Wazuh, Inc. <[email protected]>.
 # This program is free software; you can redistribute it and/or modify it under the terms of GPLv2
 import json
+from setuptools import setup, find_packages
 import os
-from setuptools import setup, find_namespace_packages
 
 package_data_list = [
  'data/agent.conf',
@@ -79,7 +79,7 @@ def get_version():
  author='Wazuh',
  author_email='[email protected]',
  license='GPLv2',
- packages=find_namespace_packages(),
+ packages=find_packages(),
  package_data={'wazuh_testing': package_data_list},
  entry_points={'console_scripts': scripts_list},
  include_package_data=True,

requirements.txt

@@ -17,18 +17,18 @@ numpy>=1.18.1
 pandas>=1.1.5
 pillow>=6.2.0; platform_system == "Linux" or platform_system == "Darwin" or platform_system=='Windows'
 psutil>=5.6.6
-py~=1.10.0; python_version <= "3.9"
-py==1.11.0; python_version >= "3.10"
+py~=1.10.0; platform_system != "Windows" or python_version <= "3.10"
+py==1.11.0; platform_system == "Windows" and python_version >= "3.11"
 pycryptodome>=3.9.8
 pyOpenSSL==19.1.0
 pytest-html==3.1.1
 pytest==6.2.2 ; python_version <= "3.9"
-pytest==7.4.0 ; python_version >= "3.10"
+pytest==7.1.2 ; python_version >= "3.10"
 pyyaml==6.0.1
 requests>=2.23.0
 scipy>=1.0; platform_system == "Linux" or platform_system == "Darwin" or platform_system=='Windows'
 seaborn>=0.11.1; platform_system == "Linux" or platform_system == "Darwin" or platform_system=='Windows'
-setuptools==68.0.0
+setuptools~=56.0.0
 testinfra==5.0.0
 jq==1.1.2 ; (platform_system == "Linux" or platform_system == "Darwin") and python_version <= "3.9"
 jq==1.2.2 ; (platform_system == "Linux" or platform_system == "Darwin") and python_version >= "3.10"