From c4f7c7e644cb988c009dc5ecfd9471c123303d56 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Sat, 3 Feb 2024 11:25:48 -0600 Subject: [PATCH] Remove 37 --- .github/workflows/test.yml | 2 +- CONTRIBUTING.md | 2 +- .../src/opentelemetry/sdk/_logs/_internal/export/__init__.py | 1 - .../src/opentelemetry/sdk/trace/export/__init__.py | 1 - shim/opentelemetry-opentracing-shim/tests/testbed/README.rst | 2 +- 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a8fc755ee3e..ca1d0fa58fd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -119,7 +119,7 @@ jobs: contrib-build: env: # We use these variables to convert between tox and GHA version literals - py37: 3.8 + py38: 3.8 runs-on: ${{ matrix.os }} strategy: fail-fast: false # ensures the entire test matrix is run, even if one permutation fails diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 61fe7605292..344b5585853 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -52,7 +52,7 @@ You can run `tox` with the following arguments: under multiple Python versions - `tox -e docs` to regenerate the API docs - `tox -e opentelemetry-api` and `tox -e opentelemetry-sdk` to run the API and SDK unit tests -- `tox -e py37-opentelemetry-api` to e.g. run the API unit tests under a specific +- `tox -e py311-opentelemetry-api` to e.g. run the API unit tests under a specific Python version - `tox -e spellcheck` to run a spellcheck on all the code - `tox -e lint` to run lint checks on all code diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/export/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/export/__init__.py index 14140d26b73..597c55a6725 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/export/__init__.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/export/__init__.py @@ -216,7 +216,6 @@ def __init__( self._flush_request = None self._log_records = [None] * self._max_export_batch_size self._worker_thread.start() - # Only available in *nix since py37. if hasattr(os, "register_at_fork"): os.register_at_fork( after_in_child=self._at_fork_reinit diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/trace/export/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/trace/export/__init__.py index 7f56a301721..a4a9958343e 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/trace/export/__init__.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/trace/export/__init__.py @@ -203,7 +203,6 @@ def __init__( None ] * self.max_export_batch_size # type: typing.List[typing.Optional[Span]] self.worker_thread.start() - # Only available in *nix since py37. if hasattr(os, "register_at_fork"): os.register_at_fork( after_in_child=self._at_fork_reinit diff --git a/shim/opentelemetry-opentracing-shim/tests/testbed/README.rst b/shim/opentelemetry-opentracing-shim/tests/testbed/README.rst index ba7119cd68c..d60f372aaea 100644 --- a/shim/opentelemetry-opentracing-shim/tests/testbed/README.rst +++ b/shim/opentelemetry-opentracing-shim/tests/testbed/README.rst @@ -9,7 +9,7 @@ Build and test. .. code-block:: sh - tox -e py37-test-opentracing-shim + tox -e py311-test-opentracing-shim Alternatively, due to the organization of the suite, it's possible to run directly the tests using ``py.test``\ :