From b497db0abafa5451c9bb40fb1563a9dce90d1b5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 18:25:15 +0000 Subject: [PATCH 1/6] build(deps): bump requests in /libbeat/tests/system Bumps [requests](https://github.com/psf/requests) from 2.31.0 to 2.32.2. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.31.0...v2.32.2) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- libbeat/tests/system/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libbeat/tests/system/requirements.txt b/libbeat/tests/system/requirements.txt index a131b0a8e06..9cee9323858 100644 --- a/libbeat/tests/system/requirements.txt +++ b/libbeat/tests/system/requirements.txt @@ -1,4 +1,4 @@ -requests==2.31.0 +requests==2.32.2 urllib3==1.26.18 docker==6.1.3 docker-compose @ git+https://github.com/pkoutsovasilis/compose@v1_fix From e3b838fc7c4393c0715231a7b921fd4747f6d02f Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Wed, 19 Jun 2024 16:19:27 -0400 Subject: [PATCH 2/6] Upgrade urllib3 to 1.26.19. --- libbeat/tests/system/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libbeat/tests/system/requirements.txt b/libbeat/tests/system/requirements.txt index 9cee9323858..cdd7a24b5ba 100644 --- a/libbeat/tests/system/requirements.txt +++ b/libbeat/tests/system/requirements.txt @@ -1,5 +1,5 @@ requests==2.32.2 -urllib3==1.26.18 +urllib3==1.26.19 docker==6.1.3 docker-compose @ git+https://github.com/pkoutsovasilis/compose@v1_fix async-timeout==4.0.3 From b231c14857e942cab31d1896fa254c557e8cf80d Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Wed, 19 Jun 2024 16:28:05 -0400 Subject: [PATCH 3/6] Upgrade to docker 7.1.0 for requests 2.23+ compatibility. --- libbeat/tests/system/requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libbeat/tests/system/requirements.txt b/libbeat/tests/system/requirements.txt index aa5b5f2713a..2fd7df69dc5 100644 --- a/libbeat/tests/system/requirements.txt +++ b/libbeat/tests/system/requirements.txt @@ -1,7 +1,7 @@ -requests==2.32.2 -urllib3==1.26.19 -docker==6.1.3 -docker-compose @ git+https://github.com/pkoutsovasilis/compose@v1_fix +requests==2.32.3 +urllib3==2.2.2 +docker==7.1.0 +docker-compose @ git+https://github.com/pkoutsovasilis/compose@27a9e2cecf64f30a6212bb1b1e843c229c4aeeeb async-timeout==4.0.3 attrs==19.3.0 autopep8==1.5.4 From 3cc0a308e7eaf2682edad16f19bd1476e4ec46f7 Mon Sep 17 00:00:00 2001 From: Panos Koutsovasilis Date: Thu, 20 Jun 2024 12:21:16 +0300 Subject: [PATCH 4/6] ci: bump compose fork, and PyYAML --- libbeat/tests/system/requirements.txt | 6 +++--- metricbeat/Dockerfile | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libbeat/tests/system/requirements.txt b/libbeat/tests/system/requirements.txt index 2fd7df69dc5..ef83e2e20e9 100644 --- a/libbeat/tests/system/requirements.txt +++ b/libbeat/tests/system/requirements.txt @@ -1,7 +1,7 @@ requests==2.32.3 -urllib3==2.2.2 +urllib3==1.26.19 docker==7.1.0 -docker-compose @ git+https://github.com/pkoutsovasilis/compose@27a9e2cecf64f30a6212bb1b1e843c229c4aeeeb +docker-compose @ git+https://github.com/pkoutsovasilis/compose@2c4d825881a624bd87c390a13f362ae76dcd6180 async-timeout==4.0.3 attrs==19.3.0 autopep8==1.5.4 @@ -58,7 +58,7 @@ pytest==7.3.2 pytest-rerunfailures==9.1.1 pytest-timeout==1.4.2 python-dotenv==0.21.1 -PyYAML==5.3.1 +PyYAML==6.0.1 redis==4.4.4 semver==2.8.1 six==1.15.0 diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index de48ddeff9d..817ffb156c0 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -23,11 +23,11 @@ ENV PATH="$VIRTUAL_ENV/bin:$PATH" RUN pip3 install --upgrade pip==20.1.1 RUN pip3 install --upgrade setuptools==47.3.2 -RUN pip3 install --upgrade PyYAML==5.3.1 -RUN pip3 install requests==2.31.0 -RUN pip3 install urllib3==1.26.18 -RUN pip3 install docker==6.1.3 -RUN pip3 install git+https://github.com/pkoutsovasilis/compose@v1_fix +RUN pip3 install --upgrade PyYAML==6.0.1 +RUN pip3 install requests==2.32.3 +RUN pip3 install urllib3==1.26.19 +RUN pip3 install docker==7.0.1 +RUN pip3 install git+https://github.com/pkoutsovasilis/compose@2c4d825881a624bd87c390a13f362ae76dcd6180 # Oracle instant client RUN cd /usr/lib \ From 22fc67a57502e2aeca1944bd9a6d09d67e73557e Mon Sep 17 00:00:00 2001 From: Panos Koutsovasilis Date: Thu, 20 Jun 2024 12:27:35 +0300 Subject: [PATCH 5/6] fix: docker version in Dockerfile --- metricbeat/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index 817ffb156c0..703159c0253 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -26,7 +26,7 @@ RUN pip3 install --upgrade setuptools==47.3.2 RUN pip3 install --upgrade PyYAML==6.0.1 RUN pip3 install requests==2.32.3 RUN pip3 install urllib3==1.26.19 -RUN pip3 install docker==7.0.1 +RUN pip3 install docker==7.1.0 RUN pip3 install git+https://github.com/pkoutsovasilis/compose@2c4d825881a624bd87c390a13f362ae76dcd6180 # Oracle instant client From c16052db3f3f4d244645b6a566d5e0f5bb9b5598 Mon Sep 17 00:00:00 2001 From: Panos Koutsovasilis Date: Thu, 20 Jun 2024 12:43:34 +0300 Subject: [PATCH 6/6] fix: remove obsolete filterwarnings from pytest.ini --- pytest.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/pytest.ini b/pytest.ini index c8a34025f6f..fdfec54930a 100644 --- a/pytest.ini +++ b/pytest.ini @@ -11,7 +11,6 @@ timeout_func_only = True # Fail on deprecation warnings filterwarnings = - error::yaml.YAMLLoadWarning error::DeprecationWarning # Ignore distutil Version class deprecation in the compose package until it can be upgraded not to use them. ignore:distutils Version classes are deprecated. Use packaging.version instead.:DeprecationWarning:.*compose.*