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 46adbac) # Conflicts: # libbeat/tests/system/requirements.txt # libbeat/tests/system/requirements_aix.txt # metricbeat/Dockerfile
elastic · Jul 24, 2023 · 979fc90 · 979fc90
1 parent 525e747
commit 979fc90
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 1 deletion.
diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc
@@ -151,6 +151,13 @@ The list below covers the major changes between 7.0.0-rc2 and main only.
 - 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
 

diff --git a/libbeat/tests/system/requirements.txt b/libbeat/tests/system/requirements.txt
@@ -37,9 +37,15 @@ pytest==7.1.3
 pytest-otel==1.3.0
 pytest-rerunfailures==9.1.1
 pytest-timeout==1.4.2
+<<<<<<< HEAD
 PyYAML==5.4.1
 redis==2.10.6
 requests==2.28.2
+=======
+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==65.5.1
 six==1.15.0

diff --git a/libbeat/tests/system/requirements_aix.txt b/libbeat/tests/system/requirements_aix.txt
@@ -36,9 +36,15 @@ pytest==7.1.3
 pytest-otel==1.3.0
 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==65.5.1
 six==1.15.0

diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
@@ -14,7 +14,11 @@ RUN \
 
 RUN pip3 install --upgrade pip==20.1.1
 RUN pip3 install --upgrade setuptools==47.3.2
+<<<<<<< HEAD
 RUN pip3 install --upgrade docker-compose==1.23.2
+=======
+RUN pip3 install --upgrade PyYAML==5.3.1
+>>>>>>> 46adbacfb5 (Pin PyYAML version to 5.3.1 to avoid CI errors temporarily (#36091))
 
 # 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
@@ -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