From 91972f6e18d5a8943315ce8d273bed289faa3442 Mon Sep 17 00:00:00 2001 From: Iuri de Silvio Date: Mon, 1 Jan 2024 19:44:01 +0100 Subject: [PATCH 1/2] Fix docker proto tests --- CHANGELOG.md | 4 ++++ tox.ini | 2 ++ 2 files changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f359c6b633f..6b69c8bfc31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +- Pin docker dependency to fix docker-compose incompatibility in + docker proto tests + ([#3611](https://github.com/open-telemetry/opentelemetry-python/pull/3611)) + ## Version 1.22.0/0.43b0 (2023-12-15) - Prometheus exporter sanitize info metric ([#3572](https://github.com/open-telemetry/opentelemetry-python/pull/3572)) diff --git a/tox.ini b/tox.ini index 86ac70d0c5a..646d3bb58e4 100644 --- a/tox.ini +++ b/tox.ini @@ -271,6 +271,8 @@ deps = pytest==7.1.3 # Pinning PyYAML for issue: https://github.com/yaml/pyyaml/issues/724 PyYAML==5.3.1 + # Pinning docker for issue: https://github.com/docker/compose/issues/11309 + docker<7 docker-compose==1.29.2 requests==2.28.2 From 797284f7e489f705fd4c0c2231ac764a814fcb1b Mon Sep 17 00:00:00 2001 From: Iuri de Silvio Date: Wed, 3 Jan 2024 08:17:55 +0100 Subject: [PATCH 2/2] Remove changelog --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b69c8bfc31..f359c6b633f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,10 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased -- Pin docker dependency to fix docker-compose incompatibility in - docker proto tests - ([#3611](https://github.com/open-telemetry/opentelemetry-python/pull/3611)) - ## Version 1.22.0/0.43b0 (2023-12-15) - Prometheus exporter sanitize info metric ([#3572](https://github.com/open-telemetry/opentelemetry-python/pull/3572))