From ce9eada64e79cd0cd163604a58ed52f159310d22 Mon Sep 17 00:00:00 2001 From: Aaron Abbott Date: Mon, 24 Apr 2023 19:21:18 +0000 Subject: [PATCH 1/2] Revert "Drop python3.11 temporarily (#205)" This reverts commit 339f347786026582bce9f1d4f3c0edf9714f045e. --- .github/workflows/ci.yaml | 11 ++++++----- opentelemetry-exporter-gcp-monitoring/setup.cfg | 1 + opentelemetry-exporter-gcp-trace/setup.cfg | 1 + opentelemetry-propagator-gcp/setup.cfg | 1 + opentelemetry-resourcedetector-gcp/setup.cfg | 1 + tox.ini | 4 ++-- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f4c1df51..3cc89dd9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,10 +13,11 @@ jobs: strategy: matrix: py: - - {version: "3.7", tox: "37"} - - {version: "3.8", tox: "38"} - - {version: "3.9", tox: "39"} - - {version: "3.10", tox: "310"} + - { version: "3.7", tox: "37" } + - { version: "3.8", tox: "38" } + - { version: "3.9", tox: "39" } + - { version: "3.10", tox: "310" } + - { version: "3.11", tox: "311" } env: run-matrix-combo: ${{ matrix.py.version }} @@ -48,7 +49,7 @@ jobs: matrix: target: [lint-ci, docs-ci, mypy-ci] py: - - {version: "3.10"} + - { version: "3.10" } env: run-matrix-combo: ${{ matrix.py.version }}-${{ matrix.target }} diff --git a/opentelemetry-exporter-gcp-monitoring/setup.cfg b/opentelemetry-exporter-gcp-monitoring/setup.cfg index 38c03266..b15c95db 100644 --- a/opentelemetry-exporter-gcp-monitoring/setup.cfg +++ b/opentelemetry-exporter-gcp-monitoring/setup.cfg @@ -18,6 +18,7 @@ classifiers = Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 [options] python_requires = >=3.7 diff --git a/opentelemetry-exporter-gcp-trace/setup.cfg b/opentelemetry-exporter-gcp-trace/setup.cfg index 1b07f799..511f5f75 100644 --- a/opentelemetry-exporter-gcp-trace/setup.cfg +++ b/opentelemetry-exporter-gcp-trace/setup.cfg @@ -18,6 +18,7 @@ classifiers = Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 [options] python_requires = >=3.7 diff --git a/opentelemetry-propagator-gcp/setup.cfg b/opentelemetry-propagator-gcp/setup.cfg index 3985da32..f3ab16a3 100644 --- a/opentelemetry-propagator-gcp/setup.cfg +++ b/opentelemetry-propagator-gcp/setup.cfg @@ -18,6 +18,7 @@ classifiers = Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 [options] python_requires = >=3.7 diff --git a/opentelemetry-resourcedetector-gcp/setup.cfg b/opentelemetry-resourcedetector-gcp/setup.cfg index 2f2307fd..e341f55b 100644 --- a/opentelemetry-resourcedetector-gcp/setup.cfg +++ b/opentelemetry-resourcedetector-gcp/setup.cfg @@ -18,6 +18,7 @@ classifiers = Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 [options] python_requires = >=3.7 diff --git a/tox.ini b/tox.ini index 6e3a3fa7..0d9dd93d 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ skipsdist = True skip_missing_interpreters = True envlist = ; Add the `ci` factor to any env that should be running during CI. - py3{7,8,9,10}-ci-test-{cloudtrace,cloudmonitoring,propagator,resourcedetector} + py3{7,8,9,10,11}-ci-test-{cloudtrace,cloudmonitoring,propagator,resourcedetector} {lint,mypy}-ci-{cloudtrace,cloudmonitoring,propagator,resourcedetector} docs-ci @@ -55,7 +55,7 @@ setenv = propagator: PACKAGE_NAME = opentelemetry-propagator-gcp resourcedetector: PACKAGE_NAME = opentelemetry-resourcedetector-gcp -[testenv:py3{7,8,9,10}-ci-test-{cloudtrace,cloudmonitoring,propagator,resourcedetector}] +[testenv:py3{7,8,9,10,11}-ci-test-{cloudtrace,cloudmonitoring,propagator,resourcedetector}] deps = test: {[constants]base_deps} test: {[constants]monorepo_deps} From e7e219a17f97115506b1ed1b605844a1f3f1face Mon Sep 17 00:00:00 2001 From: Aaron Abbott Date: Mon, 24 Apr 2023 19:29:52 +0000 Subject: [PATCH 2/2] update changelogs --- opentelemetry-exporter-gcp-monitoring/CHANGELOG.md | 3 +++ opentelemetry-exporter-gcp-trace/CHANGELOG.md | 3 +++ opentelemetry-propagator-gcp/CHANGELOG.md | 3 +++ opentelemetry-resourcedetector-gcp/CHANGELOG.md | 2 ++ 4 files changed, 11 insertions(+) diff --git a/opentelemetry-exporter-gcp-monitoring/CHANGELOG.md b/opentelemetry-exporter-gcp-monitoring/CHANGELOG.md index d0b22ea9..bc869865 100644 --- a/opentelemetry-exporter-gcp-monitoring/CHANGELOG.md +++ b/opentelemetry-exporter-gcp-monitoring/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +- Add support for Python 3.11 + ([#240](https://github.com/GoogleCloudPlatform/opentelemetry-operations-python/pull/240)) + ## Version 1.4.0a0 Released 2022-12-05 diff --git a/opentelemetry-exporter-gcp-trace/CHANGELOG.md b/opentelemetry-exporter-gcp-trace/CHANGELOG.md index 930cd4e5..98c4a9bd 100644 --- a/opentelemetry-exporter-gcp-trace/CHANGELOG.md +++ b/opentelemetry-exporter-gcp-trace/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +- Add support for Python 3.11 + ([#240](https://github.com/GoogleCloudPlatform/opentelemetry-operations-python/pull/240)) + ## Version 1.4.0 Released 2022-12-05 diff --git a/opentelemetry-propagator-gcp/CHANGELOG.md b/opentelemetry-propagator-gcp/CHANGELOG.md index e797c372..5f4df995 100644 --- a/opentelemetry-propagator-gcp/CHANGELOG.md +++ b/opentelemetry-propagator-gcp/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +- Add support for Python 3.11 + ([#240](https://github.com/GoogleCloudPlatform/opentelemetry-operations-python/pull/240)) + ## Version 1.4.0 Released 2022-12-05 diff --git a/opentelemetry-resourcedetector-gcp/CHANGELOG.md b/opentelemetry-resourcedetector-gcp/CHANGELOG.md index 85904833..54f686f2 100644 --- a/opentelemetry-resourcedetector-gcp/CHANGELOG.md +++ b/opentelemetry-resourcedetector-gcp/CHANGELOG.md @@ -4,6 +4,8 @@ - Add spec compliant GCE detection ([#231](https://github.com/GoogleCloudPlatform/opentelemetry-operations-python/pull/231)) +- Add support for Python 3.11 + ([#240](https://github.com/GoogleCloudPlatform/opentelemetry-operations-python/pull/240)) ## Version 1.4.0a0