Skip to content

Commit

Permalink
Merge pull request #4345 from wazuh/merge-4.5.0-into-4.5.1
Browse files Browse the repository at this point in the history
Merge 4.5.0 into 4.5.1
  • Loading branch information
Rebits authored Jul 21, 2023
2 parents 989f966 + 71ae8d9 commit 703efb7
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ Release report: TBD
Wazuh commit: TBD \
Release report: TBD

### Changed

- Upgrade PyYAML to 6.0.1. ([#4326](https://github.com/wazuh/wazuh-qa/pull/4326)) \- (Framework)

## [4.4.5] - 10-07-2023

Wazuh commit: https://github.com/wazuh/wazuh/commit/8d17d2c9c11bc10be9a31c83bc7c17dfbac0d2a0 \
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ 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"
pyyaml==5.4
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'
Expand Down
2 changes: 1 addition & 1 deletion tests/system/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ pandas>=1.1.5
psutil==5.6.6
pytest==4.5.0
pytest-html==2.0.1
PyYAML==5.4
PyYAML==6.0.1
testinfra==5.0.0
2 changes: 1 addition & 1 deletion tests/system/test_jwt_invalidation/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ lockfile==0.12.2
psutil==5.6.6
pytest==4.5.0
pytest-html==2.0.1
PyYAML==5.4
PyYAML==6.0.1
testinfra==5.0.0

0 comments on commit 703efb7

Please sign in to comment.