From 191b21a49d21c78eb4ad561835aef9429605ad82 Mon Sep 17 00:00:00 2001 From: Pablo Collins Date: Wed, 13 Sep 2023 13:31:32 -0400 Subject: [PATCH 1/4] add a workaround for failures when running eachdist.py --- scripts/eachdist.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/eachdist.py b/scripts/eachdist.py index 51f0f7dd2ae..a6e30f2da1b 100755 --- a/scripts/eachdist.py +++ b/scripts/eachdist.py @@ -208,8 +208,9 @@ def setup_instparser(instparser): editable=True, with_dev_deps=True, eager_upgrades=True, - with_test_deps=True, + with_test_deps=False, ) + devparser.add_argument("--with-test-deps", action="store_true") lintparser = subparsers.add_parser( "lint", help="Lint everything, autofixing if possible." From 2156cc41eb178581da1d7d956e651430acb1e81c Mon Sep 17 00:00:00 2001 From: Pablo Collins Date: Fri, 15 Sep 2023 09:54:25 -0400 Subject: [PATCH 2/4] add changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5a7a983987..b4101d50722 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#3335](https://github.com/open-telemetry/opentelemetry-python/pull/3335)) - Fix error when no LoggerProvider configured for LoggingHandler ([#3423](https://github.com/open-telemetry/opentelemetry-python/pull/3423)) - +- Tweak eachdist.py so "develop" subcommand works by default + ([#3435](https://github.com/open-telemetry/opentelemetry-python/pull/3435)) ## Version 1.20.0/0.41b0 (2023-09-04) From fefe742b9c40763bec41730b2f4952642a79cf77 Mon Sep 17 00:00:00 2001 From: Pablo Collins Date: Mon, 27 Nov 2023 14:19:25 -0500 Subject: [PATCH 3/4] sort eachdist.ini deps --- eachdist.ini | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/eachdist.ini b/eachdist.ini index 884bff2242c..8f6d6d339f5 100644 --- a/eachdist.ini +++ b/eachdist.ini @@ -3,11 +3,19 @@ [DEFAULT] sortfirst= + opentelemetry-semantic-conventions opentelemetry-api opentelemetry-sdk opentelemetry-proto opentelemetry-distro tests/opentelemetry-test-utils + exporter/opentelemetry-exporter-otlp-proto-common + exporter/opentelemetry-exporter-otlp-proto-http + exporter/opentelemetry-exporter-otlp-proto-grpc + exporter/opentelemetry-exporter-jaeger-proto-grpc + exporter/opentelemetry-exporter-jaeger-thrift + exporter/opentelemetry-exporter-zipkin-json + exporter/opentelemetry-exporter-zipkin-proto-http exporter/* [stable] From 4836815f751de1ed8bd47c56852e3ca4f1506626 Mon Sep 17 00:00:00 2001 From: Pablo Collins Date: Tue, 28 Nov 2023 10:15:53 -0500 Subject: [PATCH 4/4] revert eachdist change --- scripts/eachdist.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/eachdist.py b/scripts/eachdist.py index a6e30f2da1b..51f0f7dd2ae 100755 --- a/scripts/eachdist.py +++ b/scripts/eachdist.py @@ -208,9 +208,8 @@ def setup_instparser(instparser): editable=True, with_dev_deps=True, eager_upgrades=True, - with_test_deps=False, + with_test_deps=True, ) - devparser.add_argument("--with-test-deps", action="store_true") lintparser = subparsers.add_parser( "lint", help="Lint everything, autofixing if possible."