Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade PyYAML to 6.0.1 #4326

Merged
merged 1 commit into from
Jul 19, 2023
Merged

Conversation

jnasselle
Copy link
Member

@jnasselle jnasselle commented Jul 18, 2023

Related issue
Closing #4325

Description

This PR aims to fix #4325 by upgrading PyYAML to 6.0.1

Updated

  • Upgrade PyYAML to 6.0.1

Testing performed

It was proposed to use https://ci.wazuh.info/job/Test_integration_launcher as a tier mechanism to check if this change still allows execution integration tests

On the other hand, PyYaml is also used in system tests, and because are not integrated into Jenkins yet, manual execution shows that requirements.txt seems to be outdated and should be addressed in other issue.

@jnasselle jnasselle self-assigned this Jul 18, 2023
@jnasselle jnasselle linked an issue Jul 18, 2023 that may be closed by this pull request
@jnasselle jnasselle force-pushed the fix/4325-upgrade-pyyaml-to-6.0.1 branch from 5f0c935 to c31208d Compare July 18, 2023 14:22
@jnasselle jnasselle marked this pull request as ready for review July 18, 2023 14:47
@jnasselle jnasselle requested review from Rebits and juliamagan July 19, 2023 02:44
@Rebits
Copy link
Member

Rebits commented Jul 19, 2023

On the other hand, PyYaml is also used in system tests, and because are not integrated into Jenkins yet, manual execution shows that requirements.txt seems to be outdated and should be addressed in other issue.

@jnasselle now the requirements are place in the root directory to serve as a generic solution for all tests. However, there have been some tries (#3297) to change this condition due to it make the project dependencies hard to handle.

Copy link
Member

@Rebits Rebits left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have taken measures to ensure that these changes do not affect system tests. Using the general dependencies all the system tests of the manager_agent environment seems to work as expected:

➜  system git:(fix/4325-upgrade-pyyaml-to-6.0.1) ✗ python -m pytest -m manager_agent_env . 
==================================================================================== test session starts =====================================================================================
platform linux -- Python 3.10.6, pytest-7.1.2, pluggy-0.13.1
rootdir: /home/rebits/Wazuh/wazuh-qa/fix/4325-upgrade-pyyaml-to-6.0.1/tests/system, configfile: pytest.ini
plugins: html-3.1.1, testinfra-5.0.0, json-report-1.5.0, metadata-2.0.1, asyncio-0.20.3, docgen-1.3.0
asyncio: mode=strict
collected 139 items / 136 deselected / 3 selected                                                                                                                                            

test_active_response_log_format/test_active_response_log_format.py ...                                                                                                                 [100%]

====================================================================================== warnings summary ======================================================================================
../../../../../../.local/lib/python3.10/site-packages/wazuh_testing-4.5.0-py3.10.egg/wazuh_testing/modules/__init__.py:24
  /home/rebits/.local/lib/python3.10/site-packages/wazuh_testing-4.5.0-py3.10.egg/wazuh_testing/modules/__init__.py:24: PytestUnknownMarkWarning: Unknown pytest.mark.win32 - is this a typo?  You can register custom marks to avoid this warning - for details, see https://docs.pytest.org/en/stable/how-to/mark.html
    WINDOWS = pytest.mark.win32

../../../../../../.local/lib/python3.10/site-packages/wazuh_testing-4.5.0-py3.10.egg/wazuh_testing/modules/__init__.py:25
  /home/rebits/.local/lib/python3.10/site-packages/wazuh_testing-4.5.0-py3.10.egg/wazuh_testing/modules/__init__.py:25: PytestUnknownMarkWarning: Unknown pytest.mark.linux - is this a typo?  You can register custom marks to avoid this warning - for details, see https://docs.pytest.org/en/stable/how-to/mark.html
    LINUX = pytest.mark.linux

../../../../../../.local/lib/python3.10/site-packages/wazuh_testing-4.5.0-py3.10.egg/wazuh_testing/modules/__init__.py:26
  /home/rebits/.local/lib/python3.10/site-packages/wazuh_testing-4.5.0-py3.10.egg/wazuh_testing/modules/__init__.py:26: PytestUnknownMarkWarning: Unknown pytest.mark.darwin - is this a typo?  You can register custom marks to avoid this warning - for details, see https://docs.pytest.org/en/stable/how-to/mark.html
    MACOS = pytest.mark.darwin

../../../../../../.local/lib/python3.10/site-packages/wazuh_testing-4.5.0-py3.10.egg/wazuh_testing/modules/__init__.py:27
  /home/rebits/.local/lib/python3.10/site-packages/wazuh_testing-4.5.0-py3.10.egg/wazuh_testing/modules/__init__.py:27: PytestUnknownMarkWarning: Unknown pytest.mark.sunos5 - is this a typo?  You can register custom marks to avoid this warning - for details, see https://docs.pytest.org/en/stable/how-to/mark.html
    SOLARIS = pytest.mark.sunos5

../../../../../../.local/lib/python3.10/site-packages/wazuh_testing-4.5.0-py3.10.egg/wazuh_testing/modules/__init__.py:29
  /home/rebits/.local/lib/python3.10/site-packages/wazuh_testing-4.5.0-py3.10.egg/wazuh_testing/modules/__init__.py:29: PytestUnknownMarkWarning: Unknown pytest.mark.agent - is this a typo?  You can register custom marks to avoid this warning - for details, see https://docs.pytest.org/en/stable/how-to/mark.html
    AGENT = pytest.mark.agent

-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
================================================================= 3 passed, 136 deselected, 5 warnings in 144.70s (0:02:24) ==================================================================

@davidjiglesias davidjiglesias merged commit 2ad0ac5 into 4.5.0 Jul 19, 2023
@davidjiglesias davidjiglesias deleted the fix/4325-upgrade-pyyaml-to-6.0.1 branch July 19, 2023 14:51
@pro-akim pro-akim mentioned this pull request Sep 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Python requirements installation fails due to new Cython3 release
3 participants