diff --git a/.github/workflows/dependencies_validator.yaml b/.github/workflows/dependencies_validator.yaml deleted file mode 100644 index bbf4f68f90..0000000000 --- a/.github/workflows/dependencies_validator.yaml +++ /dev/null @@ -1,55 +0,0 @@ -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 . diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cd75489fe..229fd08bba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -100,7 +100,6 @@ Release report: https://github.com/wazuh/wazuh/issues/19111 ### Changed -- Update setuptools dependency ([#3788](https://github.com/wazuh/wazuh-qa/pull/3788)) - Update the cluster master logs reliability test to run with python 3.7 [#4445](https://github.com/wazuh/wazuh-qa/pull/4478) \- (Tests) - Update ITs URL for SUSE OVAL ([#4496](https://github.com/wazuh/wazuh-qa/pull/4496/)) diff --git a/deps/wazuh_testing/setup.py b/deps/wazuh_testing/setup.py index c156c3cbfa..f2b2c21098 100644 --- a/deps/wazuh_testing/setup.py +++ b/deps/wazuh_testing/setup.py @@ -2,8 +2,8 @@ # Created by Wazuh, Inc. . # 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='hello@wazuh.com', 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, diff --git a/requirements.txt b/requirements.txt index 76873af085..1e6d0a7464 100644 --- a/requirements.txt +++ b/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"