From aa17716aae115056aab626fbb4f01d49543a7def Mon Sep 17 00:00:00 2001 From: subham sarkar Date: Tue, 18 Jul 2023 01:37:19 +0530 Subject: [PATCH 1/2] Pin PyYAML version to 5.3.1 to avoid CI errors temporarily CPython 3.0 released recently which appears to have introduced a regression that leads to failures when installing PyYAML (and perhaps other packages too). This is a temporarily fix and this commits needs to be reverted when a proper fix is available. --- libbeat/tests/system/requirements.txt | 2 +- libbeat/tests/system/requirements_aix.txt | 2 +- metricbeat/Dockerfile | 2 +- .../module/kubernetes/_meta/terraform/eks/requirements.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libbeat/tests/system/requirements.txt b/libbeat/tests/system/requirements.txt index b65d5089c21d..6b8cc6d52a04 100644 --- a/libbeat/tests/system/requirements.txt +++ b/libbeat/tests/system/requirements.txt @@ -36,7 +36,7 @@ pyrsistent==0.16.0 pytest==7.3.2 pytest-rerunfailures==9.1.1 pytest-timeout==1.4.2 -PyYAML==5.4.1 +PyYAML==5.3.1 redis==4.4.4 requests==2.31.0 semver==2.8.1 diff --git a/libbeat/tests/system/requirements_aix.txt b/libbeat/tests/system/requirements_aix.txt index 69789e108c28..adc1a1a21717 100644 --- a/libbeat/tests/system/requirements_aix.txt +++ b/libbeat/tests/system/requirements_aix.txt @@ -35,7 +35,7 @@ pyrsistent==0.16.0 pytest==7.3.2 pytest-rerunfailures==9.1.1 pytest-timeout==1.4.2 -PyYAML==5.4.1 +PyYAML==5.3.1 redis==4.4.4 requests==2.31.0 semver==2.8.1 diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index e7ebcc933710..407d9e4fac80 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -21,7 +21,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 # Oracle instant client RUN cd /usr/lib \ diff --git a/metricbeat/module/kubernetes/_meta/terraform/eks/requirements.txt b/metricbeat/module/kubernetes/_meta/terraform/eks/requirements.txt index 2f67d6aad452..57d386ba6a0a 100644 --- a/metricbeat/module/kubernetes/_meta/terraform/eks/requirements.txt +++ b/metricbeat/module/kubernetes/_meta/terraform/eks/requirements.txt @@ -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 From 8a7e558ff7cc2675e2dff007a4f8653b78b95571 Mon Sep 17 00:00:00 2001 From: subham sarkar Date: Tue, 18 Jul 2023 01:51:22 +0530 Subject: [PATCH 2/2] Add changelog entry --- CHANGELOG-developer.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc index fc28efdbc5fe..751afbb13b07 100644 --- a/CHANGELOG-developer.next.asciidoc +++ b/CHANGELOG-developer.next.asciidoc @@ -162,6 +162,7 @@ The list below covers the major changes between 7.0.0-rc2 and main only. - 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