Skip to content

Commit

Permalink
[8.7](backport #36091) Pin PyYAML version to 5.3.1 to avoid CI errors…
Browse files Browse the repository at this point in the history
… temporarily (#36141)

* 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

* Update requirements.txt

* Update requirements_aix.txt

* Update CHANGELOG-developer.next.asciidoc

* Update Dockerfile

---------

Co-authored-by: subham sarkar <subham.sarkar@elastic.co>
Co-authored-by: Pierre HILBERT <pierre.hilbert@elastic.co>
  • Loading branch information
3 people committed Jul 24, 2023
1 parent 525e747 commit 20a2aa4
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG-developer.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ 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]
- Pin PyYAML version to 5.3.1 to avoid CI errors temporarily {pull}36091[36091]

==== Deprecated

Expand Down
2 changes: 1 addition & 1 deletion libbeat/tests/system/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ pytest==7.1.3
pytest-otel==1.3.0
pytest-rerunfailures==9.1.1
pytest-timeout==1.4.2
PyYAML==5.4.1
PyYAML==5.3.1
redis==2.10.6
requests==2.28.2
semver==2.8.1
Expand Down
2 changes: 1 addition & 1 deletion libbeat/tests/system/requirements_aix.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pytest==7.1.3
pytest-otel==1.3.0
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
Expand Down
1 change: 1 addition & 0 deletions metricbeat/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ RUN \
RUN pip3 install --upgrade pip==20.1.1
RUN pip3 install --upgrade setuptools==47.3.2
RUN pip3 install --upgrade docker-compose==1.23.2
RUN pip3 install --upgrade PyYAML==5.3.1

# Oracle instant client
RUN cd /usr/lib \
Expand Down
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

0 comments on commit 20a2aa4

Please sign in to comment.