From 880db61bac6755705decf69163a66af93fa1bd73 Mon Sep 17 00:00:00 2001 From: emdneto <9735060+emdneto@users.noreply.github.com> Date: Sat, 21 Dec 2024 13:59:37 -0300 Subject: [PATCH] disable py313 tests for parameter and fix django tests Signed-off-by: emdneto <9735060+emdneto@users.noreply.github.com> --- .github/workflows/test_0.yml | 36 ++++++++++++++++++------------------ .github/workflows/test_1.yml | 36 ++++++++++++++++++------------------ .github/workflows/test_2.yml | 18 ------------------ tox.ini | 8 +++++--- 4 files changed, 41 insertions(+), 57 deletions(-) diff --git a/.github/workflows/test_0.yml b/.github/workflows/test_0.yml index 4e692b0058..f04052c6da 100644 --- a/.github/workflows/test_0.yml +++ b/.github/workflows/test_0.yml @@ -2086,24 +2086,6 @@ jobs: - name: Run tests run: tox -e py312-test-instrumentation-django-3 -- -ra - py313-test-instrumentation-django-1_ubuntu-latest: - name: instrumentation-django-1 3.13 Ubuntu - runs-on: ubuntu-latest - steps: - - name: Checkout repo @ SHA - ${{ github.sha }} - uses: actions/checkout@v4 - - - name: Set up Python 3.13 - uses: actions/setup-python@v5 - with: - python-version: "3.13" - - - name: Install tox - run: pip install tox - - - name: Run tests - run: tox -e py313-test-instrumentation-django-1 -- -ra - py313-test-instrumentation-django-3_ubuntu-latest: name: instrumentation-django-3 3.13 Ubuntu runs-on: ubuntu-latest @@ -4515,3 +4497,21 @@ jobs: - name: Run tests run: tox -e pypy3-test-instrumentation-logging -- -ra + + py38-test-exporter-richconsole_ubuntu-latest: + name: exporter-richconsole 3.8 Ubuntu + runs-on: ubuntu-latest + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.8 + uses: actions/setup-python@v5 + with: + python-version: "3.8" + + - name: Install tox + run: pip install tox + + - name: Run tests + run: tox -e py38-test-exporter-richconsole -- -ra diff --git a/.github/workflows/test_1.yml b/.github/workflows/test_1.yml index 1946f9f46f..e761ea5330 100644 --- a/.github/workflows/test_1.yml +++ b/.github/workflows/test_1.yml @@ -16,24 +16,6 @@ env: jobs: - py38-test-exporter-richconsole_ubuntu-latest: - name: exporter-richconsole 3.8 Ubuntu - runs-on: ubuntu-latest - steps: - - name: Checkout repo @ SHA - ${{ github.sha }} - uses: actions/checkout@v4 - - - name: Set up Python 3.8 - uses: actions/setup-python@v5 - with: - python-version: "3.8" - - - name: Install tox - run: pip install tox - - - name: Run tests - run: tox -e py38-test-exporter-richconsole -- -ra - py39-test-exporter-richconsole_ubuntu-latest: name: exporter-richconsole 3.9 Ubuntu runs-on: ubuntu-latest @@ -4515,3 +4497,21 @@ jobs: - name: Run tests run: tox -e py38-test-instrumentation-sio-pika-1 -- -ra + + py39-test-instrumentation-sio-pika-0_ubuntu-latest: + name: instrumentation-sio-pika-0 3.9 Ubuntu + runs-on: ubuntu-latest + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.9 + uses: actions/setup-python@v5 + with: + python-version: "3.9" + + - name: Install tox + run: pip install tox + + - name: Run tests + run: tox -e py39-test-instrumentation-sio-pika-0 -- -ra diff --git a/.github/workflows/test_2.yml b/.github/workflows/test_2.yml index 0a4c0687d1..c9e8f9cfab 100644 --- a/.github/workflows/test_2.yml +++ b/.github/workflows/test_2.yml @@ -16,24 +16,6 @@ env: jobs: - py39-test-instrumentation-sio-pika-0_ubuntu-latest: - name: instrumentation-sio-pika-0 3.9 Ubuntu - runs-on: ubuntu-latest - steps: - - name: Checkout repo @ SHA - ${{ github.sha }} - uses: actions/checkout@v4 - - - name: Set up Python 3.9 - uses: actions/setup-python@v5 - with: - python-version: "3.9" - - - name: Install tox - run: pip install tox - - - name: Run tests - run: tox -e py39-test-instrumentation-sio-pika-0 -- -ra - py39-test-instrumentation-sio-pika-1_ubuntu-latest: name: instrumentation-sio-pika-1 3.9 Ubuntu runs-on: ubuntu-latest diff --git a/tox.ini b/tox.ini index a86ed6dc58..028eb456f5 100644 --- a/tox.ini +++ b/tox.ini @@ -79,7 +79,8 @@ envlist = ; 2: django>=4.0b1,<5.0 backports.zoneinfo==0.2.1 ; 3: django>=4.0b1,<5.0 py3{8,9}-test-instrumentation-django-{0,1,2} - py3{10,11,12,13}-test-instrumentation-django-{1,3} + py3{10,11,12}-test-instrumentation-django-{1,3} + py313-test-instrumentation-django-3 pypy3-test-instrumentation-django-{0,1} lint-instrumentation-django @@ -231,7 +232,8 @@ envlist = lint-instrumentation-pymysql ; opentelemetry-instrumentation-pyramid - py3{8,9,10,11,12,13}-test-instrumentation-pyramid + ; TODO: add py313 when supported by pyramid + py3{8,9,10,11,12}-test-instrumentation-pyramid pypy3-test-instrumentation-pyramid lint-instrumentation-pyramid @@ -508,7 +510,7 @@ deps = py3{8,9}-test-instrumentation-django-1: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt py3{8,9}-test-instrumentation-django-2: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-2.txt py3{10,11,12}-test-instrumentation-django-1: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt - py3{10,11,12}-test-instrumentation-django-3: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt + py3{10,11,12,13}-test-instrumentation-django-3: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt pypy3-test-instrumentation-django-0: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-0.txt pypy3-test-instrumentation-django-1: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt lint-instrumentation-django: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt