Skip to content

Commit ada27a5

Browse files
emdnetoemdneto
committed
add tests to CI
Signed-off-by: emdneto <[email protected]>
1 parent fdada04 commit ada27a5

File tree

3 files changed

+124
-2
lines changed

3 files changed

+124
-2
lines changed

‎.github/workflows/test_1.yml‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1492,6 +1492,24 @@ jobs:
14921492
- name: Run tests
14931493
run: tox -e py38-test-instrumentation-sqlalchemy-1 -- -ra
14941494

1495+
py38-test-instrumentation-sqlalchemy-2_ubuntu-latest:
1496+
name: instrumentation-sqlalchemy-2 3.8 Ubuntu
1497+
runs-on: ubuntu-latest
1498+
steps:
1499+
- name: Checkout repo @ SHA - ${{ github.sha }}
1500+
uses: actions/checkout@v4
1501+
1502+
- name: Set up Python 3.8
1503+
uses: actions/setup-python@v5
1504+
with:
1505+
python-version: "3.8"
1506+
1507+
- name: Install tox
1508+
run: pip install tox
1509+
1510+
- name: Run tests
1511+
run: tox -e py38-test-instrumentation-sqlalchemy-2 -- -ra
1512+
14951513
py39-test-instrumentation-sqlalchemy-1_ubuntu-latest:
14961514
name: instrumentation-sqlalchemy-1 3.9 Ubuntu
14971515
runs-on: ubuntu-latest
@@ -1510,6 +1528,24 @@ jobs:
15101528
- name: Run tests
15111529
run: tox -e py39-test-instrumentation-sqlalchemy-1 -- -ra
15121530

1531+
py39-test-instrumentation-sqlalchemy-2_ubuntu-latest:
1532+
name: instrumentation-sqlalchemy-2 3.9 Ubuntu
1533+
runs-on: ubuntu-latest
1534+
steps:
1535+
- name: Checkout repo @ SHA - ${{ github.sha }}
1536+
uses: actions/checkout@v4
1537+
1538+
- name: Set up Python 3.9
1539+
uses: actions/setup-python@v5
1540+
with:
1541+
python-version: "3.9"
1542+
1543+
- name: Install tox
1544+
run: pip install tox
1545+
1546+
- name: Run tests
1547+
run: tox -e py39-test-instrumentation-sqlalchemy-2 -- -ra
1548+
15131549
py310-test-instrumentation-sqlalchemy-1_ubuntu-latest:
15141550
name: instrumentation-sqlalchemy-1 3.10 Ubuntu
15151551
runs-on: ubuntu-latest
@@ -1528,6 +1564,24 @@ jobs:
15281564
- name: Run tests
15291565
run: tox -e py310-test-instrumentation-sqlalchemy-1 -- -ra
15301566

1567+
py310-test-instrumentation-sqlalchemy-2_ubuntu-latest:
1568+
name: instrumentation-sqlalchemy-2 3.10 Ubuntu
1569+
runs-on: ubuntu-latest
1570+
steps:
1571+
- name: Checkout repo @ SHA - ${{ github.sha }}
1572+
uses: actions/checkout@v4
1573+
1574+
- name: Set up Python 3.10
1575+
uses: actions/setup-python@v5
1576+
with:
1577+
python-version: "3.10"
1578+
1579+
- name: Install tox
1580+
run: pip install tox
1581+
1582+
- name: Run tests
1583+
run: tox -e py310-test-instrumentation-sqlalchemy-2 -- -ra
1584+
15311585
py311-test-instrumentation-sqlalchemy-1_ubuntu-latest:
15321586
name: instrumentation-sqlalchemy-1 3.11 Ubuntu
15331587
runs-on: ubuntu-latest
@@ -1546,6 +1600,24 @@ jobs:
15461600
- name: Run tests
15471601
run: tox -e py311-test-instrumentation-sqlalchemy-1 -- -ra
15481602

1603+
py311-test-instrumentation-sqlalchemy-2_ubuntu-latest:
1604+
name: instrumentation-sqlalchemy-2 3.11 Ubuntu
1605+
runs-on: ubuntu-latest
1606+
steps:
1607+
- name: Checkout repo @ SHA - ${{ github.sha }}
1608+
uses: actions/checkout@v4
1609+
1610+
- name: Set up Python 3.11
1611+
uses: actions/setup-python@v5
1612+
with:
1613+
python-version: "3.11"
1614+
1615+
- name: Install tox
1616+
run: pip install tox
1617+
1618+
- name: Run tests
1619+
run: tox -e py311-test-instrumentation-sqlalchemy-2 -- -ra
1620+
15491621
py312-test-instrumentation-sqlalchemy-1_ubuntu-latest:
15501622
name: instrumentation-sqlalchemy-1 3.12 Ubuntu
15511623
runs-on: ubuntu-latest
@@ -1564,6 +1636,24 @@ jobs:
15641636
- name: Run tests
15651637
run: tox -e py312-test-instrumentation-sqlalchemy-1 -- -ra
15661638

1639+
py312-test-instrumentation-sqlalchemy-2_ubuntu-latest:
1640+
name: instrumentation-sqlalchemy-2 3.12 Ubuntu
1641+
runs-on: ubuntu-latest
1642+
steps:
1643+
- name: Checkout repo @ SHA - ${{ github.sha }}
1644+
uses: actions/checkout@v4
1645+
1646+
- name: Set up Python 3.12
1647+
uses: actions/setup-python@v5
1648+
with:
1649+
python-version: "3.12"
1650+
1651+
- name: Install tox
1652+
run: pip install tox
1653+
1654+
- name: Run tests
1655+
run: tox -e py312-test-instrumentation-sqlalchemy-2 -- -ra
1656+
15671657
pypy3-test-instrumentation-sqlalchemy-0_ubuntu-latest:
15681658
name: instrumentation-sqlalchemy-0 pypy-3.8 Ubuntu
15691659
runs-on: ubuntu-latest
@@ -1600,6 +1690,24 @@ jobs:
16001690
- name: Run tests
16011691
run: tox -e pypy3-test-instrumentation-sqlalchemy-1 -- -ra
16021692

1693+
pypy3-test-instrumentation-sqlalchemy-2_ubuntu-latest:
1694+
name: instrumentation-sqlalchemy-2 pypy-3.8 Ubuntu
1695+
runs-on: ubuntu-latest
1696+
steps:
1697+
- name: Checkout repo @ SHA - ${{ github.sha }}
1698+
uses: actions/checkout@v4
1699+
1700+
- name: Set up Python pypy-3.8
1701+
uses: actions/setup-python@v5
1702+
with:
1703+
python-version: "pypy-3.8"
1704+
1705+
- name: Install tox
1706+
run: pip install tox
1707+
1708+
- name: Run tests
1709+
run: tox -e pypy3-test-instrumentation-sqlalchemy-2 -- -ra
1710+
16031711
py38-test-instrumentation-redis_ubuntu-latest:
16041712
name: instrumentation-redis 3.8 Ubuntu
16051713
runs-on: ubuntu-latest

‎instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-2.txt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
aiosqlite==0.20.0
2+
asgiref==3.8.1
3+
Deprecated==1.2.14
4+
greenlet==3.1.1
5+
iniconfig==2.0.0
6+
packaging==24.1
7+
pluggy==1.5.0
8+
pytest==7.4.4
9+
SQLAlchemy==2.0.36
10+
typing_extensions==4.12.2
11+
wrapt==1.16.0
12+
-e opentelemetry-instrumentation
13+
-e instrumentation/opentelemetry-instrumentation-sqlalchemy

‎tox.ini‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,8 @@ envlist =
263263
; below mean these dependencies are being used:
264264
; 0: sqlalchemy>=1.1,<1.2
265265
; 1: sqlalchemy~=1.4 aiosqlite
266-
py3{8,9,10,11,12}-test-instrumentation-sqlalchemy-{1}
267-
pypy3-test-instrumentation-sqlalchemy-{0,1}
266+
py3{8,9,10,11,12}-test-instrumentation-sqlalchemy-{1,2}
267+
pypy3-test-instrumentation-sqlalchemy-{0,1,2}
268268
lint-instrumentation-sqlalchemy
269269

270270
; opentelemetry-instrumentation-redis
@@ -746,6 +746,7 @@ commands_pre =
746746
sqlalchemy: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
747747
sqlalchemy-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-0.txt
748748
sqlalchemy-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt
749+
sqlalchemy-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-2.txt
749750
lint-instrumentation-sqlalchemy: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt
750751

751752
elasticsearch: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api

0 commit comments

Comments
 (0)