From 8633ea452a714cb30b8a910bf4ab387fa57d7b7b Mon Sep 17 00:00:00 2001 From: Dylan Russell Date: Fri, 6 Jun 2025 13:39:13 +0000 Subject: [PATCH 1/2] Drop support for python37 --- .github/workflows/ci.yaml | 1 - opentelemetry-exporter-gcp-logging/setup.cfg | 3 +-- opentelemetry-exporter-gcp-monitoring/setup.cfg | 3 +-- opentelemetry-exporter-gcp-trace/setup.cfg | 2 -- opentelemetry-propagator-gcp/setup.cfg | 3 +-- opentelemetry-resourcedetector-gcp/setup.cfg | 3 +-- .../resourcedetector/gcp_resource_detector/_gke.py | 3 +-- .../resourcedetector/gcp_resource_detector/_metadata.py | 5 +---- tox.ini | 4 ++-- 9 files changed, 8 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 666832b3..1f6645e0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,7 +13,6 @@ jobs: strategy: matrix: py: - - { version: "3.7", tox: "37" } - { version: "3.8", tox: "38" } - { version: "3.9", tox: "39" } - { version: "3.10", tox: "310" } diff --git a/opentelemetry-exporter-gcp-logging/setup.cfg b/opentelemetry-exporter-gcp-logging/setup.cfg index ff52b876..11c22d11 100644 --- a/opentelemetry-exporter-gcp-logging/setup.cfg +++ b/opentelemetry-exporter-gcp-logging/setup.cfg @@ -14,7 +14,6 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 @@ -22,7 +21,7 @@ classifiers = Programming Language :: Python :: 3.12 [options] -python_requires = >=3.7 +python_requires = >=3.8 package_dir= =src packages=find_namespace: diff --git a/opentelemetry-exporter-gcp-monitoring/setup.cfg b/opentelemetry-exporter-gcp-monitoring/setup.cfg index a21e4380..2c1903d8 100644 --- a/opentelemetry-exporter-gcp-monitoring/setup.cfg +++ b/opentelemetry-exporter-gcp-monitoring/setup.cfg @@ -14,7 +14,6 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 @@ -23,7 +22,7 @@ classifiers = Programming Language :: Python :: 3.13 [options] -python_requires = >=3.7 +python_requires = >=3.8 package_dir= =src packages=find_namespace: diff --git a/opentelemetry-exporter-gcp-trace/setup.cfg b/opentelemetry-exporter-gcp-trace/setup.cfg index b898e154..b3e871de 100644 --- a/opentelemetry-exporter-gcp-trace/setup.cfg +++ b/opentelemetry-exporter-gcp-trace/setup.cfg @@ -14,7 +14,6 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 @@ -23,7 +22,6 @@ classifiers = Programming Language :: Python :: 3.13 [options] -python_requires = >=3.7 package_dir= =src packages=find_namespace: diff --git a/opentelemetry-propagator-gcp/setup.cfg b/opentelemetry-propagator-gcp/setup.cfg index 4ba4e2fa..a345cb56 100644 --- a/opentelemetry-propagator-gcp/setup.cfg +++ b/opentelemetry-propagator-gcp/setup.cfg @@ -14,7 +14,6 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 @@ -23,7 +22,7 @@ classifiers = Programming Language :: Python :: 3.13 [options] -python_requires = >=3.7 +python_requires = >=3.8 package_dir= =src packages=find_namespace: diff --git a/opentelemetry-resourcedetector-gcp/setup.cfg b/opentelemetry-resourcedetector-gcp/setup.cfg index 47b004de..66b45c08 100644 --- a/opentelemetry-resourcedetector-gcp/setup.cfg +++ b/opentelemetry-resourcedetector-gcp/setup.cfg @@ -14,7 +14,6 @@ classifiers = License :: OSI Approved :: Apache Software License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 @@ -23,7 +22,7 @@ classifiers = Programming Language :: Python :: 3.13 [options] -python_requires = >=3.7 +python_requires = >=3.8 package_dir= =src packages=find_namespace: diff --git a/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_gke.py b/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_gke.py index 85588604..a0e41c60 100644 --- a/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_gke.py +++ b/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_gke.py @@ -20,8 +20,7 @@ _metadata, ) -# TODO: remove when Python 3.7 is dropped -from typing_extensions import Literal +from typing import Literal KUBERNETES_SERVICE_HOST_ENV = "KUBERNETES_SERVICE_HOST" diff --git a/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_metadata.py b/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_metadata.py index 30ec5344..815c26f7 100644 --- a/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_metadata.py +++ b/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_metadata.py @@ -14,13 +14,10 @@ import logging from functools import lru_cache -from typing import Union +from typing import Union, TypedDict import requests -# TODO: remove when Python 3.7 is dropped -from typing_extensions import TypedDict - _GCP_METADATA_URL = "http://metadata.google.internal/computeMetadata/v1/" _INSTANCE = "instance" _RECURSIVE_PARAMS = {"recursive": "true"} diff --git a/tox.ini b/tox.ini index e5192ce6..0b617253 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ requires = tox>=4 envlist = ; Add the `ci` factor to any env that should be running during CI. - py3{7,8,9,10,11,12,13}-ci-test-{cloudtrace,cloudmonitoring,propagator,resourcedetector, cloudlogging} + py3{8,9,10,11,12,13}-ci-test-{cloudtrace,cloudmonitoring,propagator,resourcedetector, cloudlogging} {lint,mypy}-ci-{cloudtrace,cloudmonitoring,propagator,resourcedetector, cloudlogging} docs-ci @@ -60,7 +60,7 @@ setenv = propagator: PACKAGE_NAME = opentelemetry-propagator-gcp resourcedetector: PACKAGE_NAME = opentelemetry-resourcedetector-gcp -[testenv:py3{7,8,9,10,11,12,13}-ci-test-{cloudtrace,cloudmonitoring,propagator,resourcedetector, cloudlogging}] +[testenv:py3{8,9,10,11,12,13}-ci-test-{cloudtrace,cloudmonitoring,propagator,resourcedetector, cloudlogging}] deps = ; editable install the package itself -e {toxinidir}/{env:PACKAGE_NAME} From b13999b1cc652332198856a1e95461e2c09ae77b Mon Sep 17 00:00:00 2001 From: Dylan Russell Date: Fri, 6 Jun 2025 13:43:17 +0000 Subject: [PATCH 2/2] Run linter --- .../resourcedetector/gcp_resource_detector/_gke.py | 3 +-- .../resourcedetector/gcp_resource_detector/_metadata.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_gke.py b/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_gke.py index a0e41c60..489e1947 100644 --- a/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_gke.py +++ b/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_gke.py @@ -14,14 +14,13 @@ import os from dataclasses import dataclass +from typing import Literal from opentelemetry.resourcedetector.gcp_resource_detector import ( _gce, _metadata, ) -from typing import Literal - KUBERNETES_SERVICE_HOST_ENV = "KUBERNETES_SERVICE_HOST" diff --git a/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_metadata.py b/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_metadata.py index 815c26f7..51db5613 100644 --- a/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_metadata.py +++ b/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_metadata.py @@ -14,7 +14,7 @@ import logging from functools import lru_cache -from typing import Union, TypedDict +from typing import TypedDict, Union import requests