Merge pull request #3788 from wazuh/3760-setuptools-dep

Upgrade setuptools dependency

.github/workflows/dependencies_validator.yaml

@@ -0,0 +1,55 @@
+name: Wazuh QA Framework Validator
+on:
+ pull_request:
+ paths:
+ - requirements.txt
+ - deps/wazuh_testing/setup.py
+jobs:
+ validate-framework-linux:
+ runs-on: ubuntu-20.04
+ continue-on-error: true
+ strategy:
+ matrix:
+ python-version:
+ - 3.10.9
+ - 3.7.1
+ steps:
+ - name: Check out code
+ uses: actions/checkout@v2
+
+ - name: Set up Python
+ uses: actions/setup-python@v2
+ with:
+ python-version: ${{ matrix.python-version }}
+
+ - name: Install dependencies
+ run: pip install -r requirements.txt
+
+ - name: Install package
+ run: |
+ cd deps/wazuh_testing
+ pip install .
+
+ validate-framework-windows:
+ runs-on: windows-2019
+ continue-on-error: true
+ strategy:
+ matrix:
+ python-version:
+ - 3.11.4
+ steps:
+ - name: Check out code
+ uses: actions/checkout@v2
+
+ - name: Set up Python
+ uses: actions/setup-python@v2
+ with:
+ python-version: ${{ matrix.python-version }}
+
+ - name: Install dependencies
+ run: pip install -r requirements.txt
+
+ - name: Install package
+ run: |
+ cd deps/wazuh_testing
+ pip install .

CHANGELOG.md

@@ -9,6 +9,7 @@ Release report: TBD
 
 ### Changed
 
+- Update setuptools dependency ([#3788](https:/wazuh/wazuh-qa/pull/3788))
 - Updated the cluster master logs reliability test to run with python 3.7 [#4445](https:/wazuh/wazuh-qa/pull/4478) \- (Tests)
 
 ### Fixed
@@ -137,8 +138,6 @@ Release report: https:/wazuh/wazuh/issues/15504
 - Adapt binary performance module to wazuh-cluster script renaming ([#3944](https:/wazuh/wazuh-qa/pull/3944)) \- (Framework)
 - Add an option to store logs in system tests ([#2445](https:/wazuh/wazuh-qa/pull/2445)) \- (Framework + Tests)
 - Add new test to check cpe_helper.json file ([#3731](https:/wazuh/wazuh-qa/pull/3731))
-- Add new tests analysid handling of invalid/empty rule signature IDs ([#3649]
-(https:/wazuh/wazuh-qa/pull/3649)) \- (Framework + Tests)
 - Add integration test to check statistics format ([#3813](https:/wazuh/wazuh-qa/pull/3813)) \- (Framework + Tests)
 - Add new test to check vulnerable packages with triaged null([#3587](https:/wazuh/wazuh-qa/pull/3587)) \- (Framework + Tests)
 - Add new tests analysid handling of invalid/empty rule signature IDs ([#3649](https:/wazuh/wazuh-qa/pull/3649)) \- (Framework + Tests)

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',
@@ -77,7 +77,7 @@ def get_version():
  author='Wazuh',
  author_email='[email protected]',
  license='GPLv2',
- packages=find_packages(),
+ packages=find_namespace_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; platform_system != "Windows" or python_version <= "3.10"
-py==1.11.0; platform_system == "Windows" and python_version >= "3.11"
+py~=1.10.0; python_version <= "3.9"
+py==1.11.0; python_version >= "3.10"
 pycryptodome>=3.9.8
 pyOpenSSL==19.1.0
 pytest-html==3.1.1
 pytest==6.2.2 ; python_version <= "3.9"
-pytest==7.1.2 ; python_version >= "3.10"
+pytest==7.4.0 ; 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~=56.0.0
+setuptools==68.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"