Skip to content

Commit 517cefb

Browse files
emdnetoemdneto
committed
fix pyramid, django
Signed-off-by: emdneto <[email protected]>
1 parent bb5003e commit 517cefb

File tree

4 files changed

+59
-93
lines changed

4 files changed

+59
-93
lines changed

‎.github/workflows/test_0.yml

+18-18
Original file line numberDiff line numberDiff line change
@@ -2086,24 +2086,6 @@ jobs:
20862086
- name: Run tests
20872087
run: tox -e py312-test-instrumentation-django-3 -- -ra
20882088

2089-
py313-test-instrumentation-django-1_ubuntu-latest:
2090-
name: instrumentation-django-1 3.13 Ubuntu
2091-
runs-on: ubuntu-latest
2092-
steps:
2093-
- name: Checkout repo @ SHA - ${{ github.sha }}
2094-
uses: actions/checkout@v4
2095-
2096-
- name: Set up Python 3.13
2097-
uses: actions/setup-python@v5
2098-
with:
2099-
python-version: "3.13"
2100-
2101-
- name: Install tox
2102-
run: pip install tox
2103-
2104-
- name: Run tests
2105-
run: tox -e py313-test-instrumentation-django-1 -- -ra
2106-
21072089
py313-test-instrumentation-django-3_ubuntu-latest:
21082090
name: instrumentation-django-3 3.13 Ubuntu
21092091
runs-on: ubuntu-latest
@@ -4515,3 +4497,21 @@ jobs:
45154497

45164498
- name: Run tests
45174499
run: tox -e pypy3-test-instrumentation-logging -- -ra
4500+
4501+
py38-test-exporter-richconsole_ubuntu-latest:
4502+
name: exporter-richconsole 3.8 Ubuntu
4503+
runs-on: ubuntu-latest
4504+
steps:
4505+
- name: Checkout repo @ SHA - ${{ github.sha }}
4506+
uses: actions/checkout@v4
4507+
4508+
- name: Set up Python 3.8
4509+
uses: actions/setup-python@v5
4510+
with:
4511+
python-version: "3.8"
4512+
4513+
- name: Install tox
4514+
run: pip install tox
4515+
4516+
- name: Run tests
4517+
run: tox -e py38-test-exporter-richconsole -- -ra

‎.github/workflows/test_1.yml

+36-36
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,6 @@ env:
1616

1717
jobs:
1818

19-
py38-test-exporter-richconsole_ubuntu-latest:
20-
name: exporter-richconsole 3.8 Ubuntu
21-
runs-on: ubuntu-latest
22-
steps:
23-
- name: Checkout repo @ SHA - ${{ github.sha }}
24-
uses: actions/checkout@v4
25-
26-
- name: Set up Python 3.8
27-
uses: actions/setup-python@v5
28-
with:
29-
python-version: "3.8"
30-
31-
- name: Install tox
32-
run: pip install tox
33-
34-
- name: Run tests
35-
run: tox -e py38-test-exporter-richconsole -- -ra
36-
3719
py39-test-exporter-richconsole_ubuntu-latest:
3820
name: exporter-richconsole 3.9 Ubuntu
3921
runs-on: ubuntu-latest
@@ -1852,24 +1834,6 @@ jobs:
18521834
- name: Run tests
18531835
run: tox -e py312-test-instrumentation-pyramid -- -ra
18541836

1855-
py313-test-instrumentation-pyramid_ubuntu-latest:
1856-
name: instrumentation-pyramid 3.13 Ubuntu
1857-
runs-on: ubuntu-latest
1858-
steps:
1859-
- name: Checkout repo @ SHA - ${{ github.sha }}
1860-
uses: actions/checkout@v4
1861-
1862-
- name: Set up Python 3.13
1863-
uses: actions/setup-python@v5
1864-
with:
1865-
python-version: "3.13"
1866-
1867-
- name: Install tox
1868-
run: pip install tox
1869-
1870-
- name: Run tests
1871-
run: tox -e py313-test-instrumentation-pyramid -- -ra
1872-
18731837
pypy3-test-instrumentation-pyramid_ubuntu-latest:
18741838
name: instrumentation-pyramid pypy-3.8 Ubuntu
18751839
runs-on: ubuntu-latest
@@ -4515,3 +4479,39 @@ jobs:
45154479

45164480
- name: Run tests
45174481
run: tox -e py38-test-instrumentation-sio-pika-1 -- -ra
4482+
4483+
py39-test-instrumentation-sio-pika-0_ubuntu-latest:
4484+
name: instrumentation-sio-pika-0 3.9 Ubuntu
4485+
runs-on: ubuntu-latest
4486+
steps:
4487+
- name: Checkout repo @ SHA - ${{ github.sha }}
4488+
uses: actions/checkout@v4
4489+
4490+
- name: Set up Python 3.9
4491+
uses: actions/setup-python@v5
4492+
with:
4493+
python-version: "3.9"
4494+
4495+
- name: Install tox
4496+
run: pip install tox
4497+
4498+
- name: Run tests
4499+
run: tox -e py39-test-instrumentation-sio-pika-0 -- -ra
4500+
4501+
py39-test-instrumentation-sio-pika-1_ubuntu-latest:
4502+
name: instrumentation-sio-pika-1 3.9 Ubuntu
4503+
runs-on: ubuntu-latest
4504+
steps:
4505+
- name: Checkout repo @ SHA - ${{ github.sha }}
4506+
uses: actions/checkout@v4
4507+
4508+
- name: Set up Python 3.9
4509+
uses: actions/setup-python@v5
4510+
with:
4511+
python-version: "3.9"
4512+
4513+
- name: Install tox
4514+
run: pip install tox
4515+
4516+
- name: Run tests
4517+
run: tox -e py39-test-instrumentation-sio-pika-1 -- -ra

‎.github/workflows/test_2.yml

-36
Original file line numberDiff line numberDiff line change
@@ -16,42 +16,6 @@ env:
1616

1717
jobs:
1818

19-
py39-test-instrumentation-sio-pika-0_ubuntu-latest:
20-
name: instrumentation-sio-pika-0 3.9 Ubuntu
21-
runs-on: ubuntu-latest
22-
steps:
23-
- name: Checkout repo @ SHA - ${{ github.sha }}
24-
uses: actions/checkout@v4
25-
26-
- name: Set up Python 3.9
27-
uses: actions/setup-python@v5
28-
with:
29-
python-version: "3.9"
30-
31-
- name: Install tox
32-
run: pip install tox
33-
34-
- name: Run tests
35-
run: tox -e py39-test-instrumentation-sio-pika-0 -- -ra
36-
37-
py39-test-instrumentation-sio-pika-1_ubuntu-latest:
38-
name: instrumentation-sio-pika-1 3.9 Ubuntu
39-
runs-on: ubuntu-latest
40-
steps:
41-
- name: Checkout repo @ SHA - ${{ github.sha }}
42-
uses: actions/checkout@v4
43-
44-
- name: Set up Python 3.9
45-
uses: actions/setup-python@v5
46-
with:
47-
python-version: "3.9"
48-
49-
- name: Install tox
50-
run: pip install tox
51-
52-
- name: Run tests
53-
run: tox -e py39-test-instrumentation-sio-pika-1 -- -ra
54-
5519
py310-test-instrumentation-sio-pika-0_ubuntu-latest:
5620
name: instrumentation-sio-pika-0 3.10 Ubuntu
5721
runs-on: ubuntu-latest

‎tox.ini

+5-3
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ envlist =
7979
; 2: django>=4.0b1,<5.0 backports.zoneinfo==0.2.1
8080
; 3: django>=4.0b1,<5.0
8181
py3{8,9}-test-instrumentation-django-{0,1,2}
82-
py3{10,11,12,13}-test-instrumentation-django-{1,3}
82+
py3{10,11,12}-test-instrumentation-django-{1,3}
83+
py313-test-instrumentation-django-3
8384
pypy3-test-instrumentation-django-{0,1}
8485
lint-instrumentation-django
8586

@@ -231,7 +232,8 @@ envlist =
231232
lint-instrumentation-pymysql
232233

233234
; opentelemetry-instrumentation-pyramid
234-
py3{8,9,10,11,12,13}-test-instrumentation-pyramid
235+
; TODO: add py313 when supported by pyramid
236+
py3{8,9,10,11,12}-test-instrumentation-pyramid
235237
pypy3-test-instrumentation-pyramid
236238
lint-instrumentation-pyramid
237239

@@ -508,7 +510,7 @@ deps =
508510
py3{8,9}-test-instrumentation-django-1: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt
509511
py3{8,9}-test-instrumentation-django-2: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-2.txt
510512
py3{10,11,12}-test-instrumentation-django-1: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt
511-
py3{10,11,12}-test-instrumentation-django-3: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt
513+
py3{10,11,12,13}-test-instrumentation-django-3: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt
512514
pypy3-test-instrumentation-django-0: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-0.txt
513515
pypy3-test-instrumentation-django-1: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt
514516
lint-instrumentation-django: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt

0 commit comments

Comments
 (0)