Merge branch 'main' into enable-commenter-instrument-connection

open-telemetry · Jan 22, 2025 · 1526aaa · 1526aaa
2 parents e3db4a8 + 3f50c08
commit 1526aaa
Show file tree

Hide file tree

Showing 49 changed files with 3,102 additions and 1,119 deletions.
diff --git a/.github/workflows/core_contrib_test_0.yml b/.github/workflows/core_contrib_test_0.yml
diff --git a/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/core_contrib_test.yml.j2 b/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/core_contrib_test.yml.j2
@@ -37,7 +37,7 @@ jobs:
           architecture: "x64"
 
       - name: Install tox
-        run: pip install tox
+        run: pip install tox-uv
 
       - name: Run tests
         run: tox -e {{ job_data.tox_env }} -- -ra

diff --git a/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/lint.yml.j2 b/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/lint.yml.j2
@@ -30,7 +30,7 @@ jobs:
           python-version: "3.13"
 
       - name: Install tox
-        run: pip install tox
+        run: pip install tox-uv
 
       - name: Run tests
         run: tox -e {{ job_data.tox_env }}

diff --git a/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2 b/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2
@@ -57,7 +57,7 @@ jobs:
           python-version: "3.11"
 
       - name: Install tox
-        run: pip install tox
+        run: pip install tox-uv
 
       - name: Run tests
         run: tox -e {{ job_data }}

diff --git a/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/test.yml.j2 b/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/test.yml.j2
@@ -30,7 +30,7 @@ jobs:
           python-version: "{{ job_data.python_version }}"
 
       - name: Install tox
-        run: pip install tox
+        run: pip install tox-uv
       {%- if job_data.os == "windows-latest" %}
 
       - name: Configure git to support long filenames