From ed99337651f7e8281892b7376038ed533ce2974f Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 18 Jul 2023 09:37:53 +0000 Subject: [PATCH] [7.17](backport #36091) Pin PyYAML version to 5.3.1 to avoid CI errors temporarily (#36093) * Pin PyYAML version to 5.3.1 to avoid CI errors temporarily (#36091) CPython 3.0 was released recently which appears to have introduced a regression that leads to failures when installing PyYAML (and perhaps other packages too). This is a temporary fix and this commits needs to be reverted when a proper fix is available. (cherry picked from commit 46adbacfb5a89a02c025b11a66a6e5dbbaf4514a) # Conflicts: # libbeat/tests/system/requirements.txt # libbeat/tests/system/requirements_aix.txt * Resolve conflicts --------- Co-authored-by: subham sarkar Co-authored-by: Denis Rechkunov --- CHANGELOG-developer.next.asciidoc | 1 + filebeat/Dockerfile | 2 +- libbeat/tests/system/requirements.txt | 2 +- libbeat/tests/system/requirements_aix.txt | 2 +- metricbeat/Dockerfile | 2 +- .../module/kubernetes/_meta/terraform/eks/requirements.txt | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc index ebd6e2620398..3cdd2100bc8e 100644 --- a/CHANGELOG-developer.next.asciidoc +++ b/CHANGELOG-developer.next.asciidoc @@ -121,6 +121,7 @@ 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] +- Pin PyYAML version to 5.3.1 to avoid CI errors temporarily {pull}36091[36091] ==== Deprecated diff --git a/filebeat/Dockerfile b/filebeat/Dockerfile index e28f8567272a..c9c70ddb04b3 100644 --- a/filebeat/Dockerfile +++ b/filebeat/Dockerfile @@ -20,4 +20,4 @@ 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 PyYAML==6.0.0 +RUN pip3 install --upgrade PyYAML==5.3.1 diff --git a/libbeat/tests/system/requirements.txt b/libbeat/tests/system/requirements.txt index e03ece93c66b..5459644a6cd3 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==2.10.6 requests==2.25.1 semver==2.8.1 diff --git a/libbeat/tests/system/requirements_aix.txt b/libbeat/tests/system/requirements_aix.txt index b6857276c620..2a183cc71f34 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==2.10.6 requests==2.25.1 semver==2.8.1 diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index f1b45388bd96..496a1c8835d4 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -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 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