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

[7.17](backport #36091) Pin PyYAML version to 5.3.1 to avoid CI errors temporarily #36093

Merged
merged 3 commits into from
Jul 18, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions CHANGELOG-developer.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,18 @@ The list below covers the major changes between 7.0.0-rc2 and master only.
- Whitelist `GCP_*` environment variables in dev tools {pull}28364[28364]
- Improve tests files with shorter statements. {pull}35667[35667]
- Improve compatibility and reduce flakyness of Python tests {pull}31588[31588]
- Added `.python-version` file {pull}32323[32323]
- Use `T.TempDir` to create temporary test directory {pull}33082[33082]
- Add an option to disable event normalization when creating a `beat.Client`. {pull}33657[33657]
- Add the file path of the instance lock on the error when it's is already locked {pull}33788[33788]
- Add DropFields processor to js API {pull}33458[33458]
- Add support for different folders when testing data {pull}34467[34467]
- Add logging of metric registration in inputmon. {pull}35647[35647]
- Add Okta API package for entity analytics. {pull}35478[35478]
- Add benchmarking to HTTPJSON input testing. {pull}35138[35138]
- Allow non-AWS endpoints for testing Filebeat awss3 input. {issue}35496[35496] {pull}35520[35520]
- Add AUTH (username) and SSL/TLS support for Redis module {pull}35240[35240]
- Pin PyYAML version to 5.3.1 to avoid CI errors temporarily {pull}36091[36091]

==== Deprecated

Expand Down
6 changes: 6 additions & 0 deletions libbeat/tests/system/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,15 @@ pyrsistent==0.16.0
pytest==7.3.2
pytest-rerunfailures==9.1.1
pytest-timeout==1.4.2
<<<<<<< HEAD
PyYAML==5.4.1
redis==2.10.6
requests==2.25.1
=======
PyYAML==5.3.1
redis==4.4.4
requests==2.31.0
>>>>>>> 46adbacfb5 (Pin PyYAML version to 5.3.1 to avoid CI errors temporarily (#36091))
semver==2.8.1
setuptools==47.3.2
six==1.15.0
Expand Down
6 changes: 6 additions & 0 deletions libbeat/tests/system/requirements_aix.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,15 @@ pyrsistent==0.16.0
pytest==7.3.2
pytest-rerunfailures==9.1.1
pytest-timeout==1.4.2
<<<<<<< HEAD
PyYAML==5.4.1
redis==2.10.6
requests==2.25.1
=======
PyYAML==5.3.1
redis==4.4.4
requests==2.31.0
>>>>>>> 46adbacfb5 (Pin PyYAML version to 5.3.1 to avoid CI errors temporarily (#36091))
semver==2.8.1
setuptools==47.3.2
six==1.15.0
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ENV PATH="$VIRTUAL_ENV/bin:$PATH"
RUN pip3 install --upgrade pip==20.1.1
RUN pip3 install --upgrade docker-compose==1.23.2
RUN pip3 install --upgrade setuptools==47.3.2
RUN pip3 install --upgrade PyYAML==6.0.0
RUN pip3 install --upgrade PyYAML==5.3.1

# Add healthcheck for the docker/healthcheck metricset to check during testing.
HEALTHCHECK CMD exit 0
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ docutils==0.15.2
jmespath==0.9.5
pyasn1==0.4.8
python-dateutil==2.8.1
PyYAML==5.4.1
PyYAML==5.3.1
rsa==4.7.2
s3transfer==0.3.3
six==1.14.0
Expand Down