Skip to content

Commit 26c68f5

Browse files
JWinermaSplunkJWinermaSplunk
committed
rebase, tox
1 parent 647b874 commit 26c68f5

4 files changed

Lines changed: 146 additions & 3 deletions

File tree

‎.github/workflows/core_contrib_test.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1767,6 +1767,36 @@ jobs:
17671767
- name: Run tests
17681768
run: tox -e py310-test-instrumentation-starlette-latest -- -ra
17691769

1770+
py310-test-instrumentation-structlog:
1771+
name: instrumentation-structlog
1772+
runs-on: ubuntu-latest
1773+
timeout-minutes: 30
1774+
steps:
1775+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
1776+
uses: actions/checkout@v4
1777+
with:
1778+
repository: open-telemetry/opentelemetry-python-contrib
1779+
ref: ${{ env.CONTRIB_REPO_SHA }}
1780+
1781+
- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
1782+
uses: actions/checkout@v4
1783+
with:
1784+
repository: open-telemetry/opentelemetry-python
1785+
ref: ${{ env.CORE_REPO_SHA }}
1786+
path: opentelemetry-python
1787+
1788+
- name: Set up Python 3.10
1789+
uses: actions/setup-python@v5
1790+
with:
1791+
python-version: "3.10"
1792+
architecture: "x64"
1793+
1794+
- name: Install tox
1795+
run: pip install tox-uv
1796+
1797+
- name: Run tests
1798+
run: tox -e py310-test-instrumentation-structlog -- -ra
1799+
17701800
py310-test-instrumentation-jinja2:
17711801
name: instrumentation-jinja2
17721802
runs-on: ubuntu-latest

‎.github/workflows/test.yml‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5914,6 +5914,120 @@ jobs:
59145914
- name: Run tests
59155915
run: tox -e pypy3-test-instrumentation-starlette-latest -- -ra
59165916

5917+
py310-test-instrumentation-structlog_ubuntu-latest:
5918+
name: instrumentation-structlog 3.10 Ubuntu
5919+
runs-on: ubuntu-latest
5920+
timeout-minutes: 30
5921+
steps:
5922+
- name: Checkout repo @ SHA - ${{ github.sha }}
5923+
uses: actions/checkout@v4
5924+
5925+
- name: Set up Python 3.10
5926+
uses: actions/setup-python@v5
5927+
with:
5928+
python-version: "3.10"
5929+
5930+
- name: Install tox
5931+
run: pip install tox-uv
5932+
5933+
- name: Run tests
5934+
run: tox -e py310-test-instrumentation-structlog -- -ra
5935+
5936+
py311-test-instrumentation-structlog_ubuntu-latest:
5937+
name: instrumentation-structlog 3.11 Ubuntu
5938+
runs-on: ubuntu-latest
5939+
timeout-minutes: 30
5940+
steps:
5941+
- name: Checkout repo @ SHA - ${{ github.sha }}
5942+
uses: actions/checkout@v4
5943+
5944+
- name: Set up Python 3.11
5945+
uses: actions/setup-python@v5
5946+
with:
5947+
python-version: "3.11"
5948+
5949+
- name: Install tox
5950+
run: pip install tox-uv
5951+
5952+
- name: Run tests
5953+
run: tox -e py311-test-instrumentation-structlog -- -ra
5954+
5955+
py312-test-instrumentation-structlog_ubuntu-latest:
5956+
name: instrumentation-structlog 3.12 Ubuntu
5957+
runs-on: ubuntu-latest
5958+
timeout-minutes: 30
5959+
steps:
5960+
- name: Checkout repo @ SHA - ${{ github.sha }}
5961+
uses: actions/checkout@v4
5962+
5963+
- name: Set up Python 3.12
5964+
uses: actions/setup-python@v5
5965+
with:
5966+
python-version: "3.12"
5967+
5968+
- name: Install tox
5969+
run: pip install tox-uv
5970+
5971+
- name: Run tests
5972+
run: tox -e py312-test-instrumentation-structlog -- -ra
5973+
5974+
py313-test-instrumentation-structlog_ubuntu-latest:
5975+
name: instrumentation-structlog 3.13 Ubuntu
5976+
runs-on: ubuntu-latest
5977+
timeout-minutes: 30
5978+
steps:
5979+
- name: Checkout repo @ SHA - ${{ github.sha }}
5980+
uses: actions/checkout@v4
5981+
5982+
- name: Set up Python 3.13
5983+
uses: actions/setup-python@v5
5984+
with:
5985+
python-version: "3.13"
5986+
5987+
- name: Install tox
5988+
run: pip install tox-uv
5989+
5990+
- name: Run tests
5991+
run: tox -e py313-test-instrumentation-structlog -- -ra
5992+
5993+
py314-test-instrumentation-structlog_ubuntu-latest:
5994+
name: instrumentation-structlog 3.14 Ubuntu
5995+
runs-on: ubuntu-latest
5996+
timeout-minutes: 30
5997+
steps:
5998+
- name: Checkout repo @ SHA - ${{ github.sha }}
5999+
uses: actions/checkout@v4
6000+
6001+
- name: Set up Python 3.14
6002+
uses: actions/setup-python@v5
6003+
with:
6004+
python-version: "3.14"
6005+
6006+
- name: Install tox
6007+
run: pip install tox-uv
6008+
6009+
- name: Run tests
6010+
run: tox -e py314-test-instrumentation-structlog -- -ra
6011+
6012+
pypy3-test-instrumentation-structlog_ubuntu-latest:
6013+
name: instrumentation-structlog pypy-3.10 Ubuntu
6014+
runs-on: ubuntu-latest
6015+
timeout-minutes: 30
6016+
steps:
6017+
- name: Checkout repo @ SHA - ${{ github.sha }}
6018+
uses: actions/checkout@v4
6019+
6020+
- name: Set up Python pypy-3.10
6021+
uses: actions/setup-python@v5
6022+
with:
6023+
python-version: "pypy-3.10"
6024+
6025+
- name: Install tox
6026+
run: pip install tox-uv
6027+
6028+
- name: Run tests
6029+
run: tox -e pypy3-test-instrumentation-structlog -- -ra
6030+
59176031
py310-test-instrumentation-jinja2_ubuntu-latest:
59186032
name: instrumentation-jinja2 3.10 Ubuntu
59196033
runs-on: ubuntu-latest

‎instrumentation/opentelemetry-instrumentation-structlog/pyproject.toml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dynamic = ["version"]
88
description = "OpenTelemetry structlog instrumentation"
99
readme = "README.rst"
1010
license = "Apache-2.0"
11-
requires-python = ">=3.9"
11+
requires-python = ">=3.10"
1212
authors = [
1313
{ name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" },
1414
]
@@ -18,7 +18,6 @@ classifiers = [
1818
"License :: OSI Approved :: Apache Software License",
1919
"Programming Language :: Python",
2020
"Programming Language :: Python :: 3",
21-
"Programming Language :: Python :: 3.9",
2221
"Programming Language :: Python :: 3.10",
2322
"Programming Language :: Python :: 3.11",
2423
"Programming Language :: Python :: 3.12",

‎tox.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ envlist =
195195
lint-instrumentation-starlette
196196

197197
; opentelemetry-instrumentation-structlog
198-
py3{9,10,11,12,13,14}-test-instrumentation-structlog
198+
py3{10,11,12,13,14}-test-instrumentation-structlog
199199
pypy3-test-instrumentation-structlog
200200
lint-instrumentation-structlog
201201

0 commit comments

Comments
 (0)