Merge branch 'main' into histogram-advisory

open-telemetry · Dec 19, 2024 · 3c8b98e · 3c8b98e
2 parents db45303 + 3ae1138
commit 3c8b98e
Show file tree

Hide file tree

Showing 31 changed files with 807 additions and 318 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -13,7 +13,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: "3.12"
+        python-version: "3.13"
         architecture: 'x64'
     - name: Install tox
       run: pip install tox

diff --git a/.github/workflows/generate_workflows.py b/.github/workflows/generate_workflows.py
@@ -53,6 +53,7 @@ def get_test_job_datas(tox_envs: list, operating_systems: list) -> list:
         "py310": "3.10",
         "py311": "3.11",
         "py312": "3.12",
+        "py313": "3.13",
     }
 
     test_job_datas = []