Skip to content

Commit 46a6e44

Browse files
committed
Fix formatting, broke ntest
1 parent 1c6033e commit 46a6e44

File tree

4 files changed

+20
-45
lines changed

4 files changed

+20
-45
lines changed

.github/workflows/test_1.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4060,25 +4060,6 @@ jobs:
40604060
- name: Run tests
40614061
run: tox -e py313-test-exporter-credential-provider-gcp -- -ra
40624062

4063-
pypy3-test-exporter-credential-provider-gcp_ubuntu-latest:
4064-
name: exporter-credential-provider-gcp pypy-3.9 Ubuntu
4065-
runs-on: ubuntu-latest
4066-
timeout-minutes: 30
4067-
steps:
4068-
- name: Checkout repo @ SHA - ${{ github.sha }}
4069-
uses: actions/checkout@v4
4070-
4071-
- name: Set up Python pypy-3.9
4072-
uses: actions/setup-python@v5
4073-
with:
4074-
python-version: "pypy-3.9"
4075-
4076-
- name: Install tox
4077-
run: pip install tox-uv
4078-
4079-
- name: Run tests
4080-
run: tox -e pypy3-test-exporter-credential-provider-gcp -- -ra
4081-
40824063
py39-test-util-genai_ubuntu-latest:
40834064
name: util-genai 3.9 Ubuntu
40844065
runs-on: ubuntu-latest
@@ -4781,3 +4762,22 @@ jobs:
47814762

47824763
- name: Run tests
47834764
run: tox -e py39-test-instrumentation-aio-pika-0 -- -ra
4765+
4766+
py39-test-instrumentation-aio-pika-1_ubuntu-latest:
4767+
name: instrumentation-aio-pika-1 3.9 Ubuntu
4768+
runs-on: ubuntu-latest
4769+
timeout-minutes: 30
4770+
steps:
4771+
- name: Checkout repo @ SHA - ${{ github.sha }}
4772+
uses: actions/checkout@v4
4773+
4774+
- name: Set up Python 3.9
4775+
uses: actions/setup-python@v5
4776+
with:
4777+
python-version: "3.9"
4778+
4779+
- name: Install tox
4780+
run: pip install tox-uv
4781+
4782+
- name: Run tests
4783+
run: tox -e py39-test-instrumentation-aio-pika-1 -- -ra

.github/workflows/test_2.yml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,6 @@ env:
3232

3333
jobs:
3434

35-
py39-test-instrumentation-aio-pika-1_ubuntu-latest:
36-
name: instrumentation-aio-pika-1 3.9 Ubuntu
37-
runs-on: ubuntu-latest
38-
timeout-minutes: 30
39-
steps:
40-
- name: Checkout repo @ SHA - ${{ github.sha }}
41-
uses: actions/checkout@v4
42-
43-
- name: Set up Python 3.9
44-
uses: actions/setup-python@v5
45-
with:
46-
python-version: "3.9"
47-
48-
- name: Install tox
49-
run: pip install tox-uv
50-
51-
- name: Run tests
52-
run: tox -e py39-test-instrumentation-aio-pika-1 -- -ra
53-
5435
py39-test-instrumentation-aio-pika-2_ubuntu-latest:
5536
name: instrumentation-aio-pika-2 3.9 Ubuntu
5637
runs-on: ubuntu-latest

exporter/opentelemetry-exporter-credential-provider-gcp/tests/test_credential_provider.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
from os import environ
15-
from platform import python_implementation
1615
from unittest import TestCase
1716
from unittest.mock import MagicMock, patch
1817

1918
from google.auth.transport.requests import AuthorizedSession
20-
from pytest import mark
2119

2220
from opentelemetry.exporter.otlp.proto.http.trace_exporter import (
2321
OTLPSpanExporter,
@@ -27,7 +25,7 @@
2725
_OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER,
2826
)
2927

30-
# pyright: reportUnknownMemberType=false, reportUnknownVariableType=false, reportMissingImports=false
28+
# pyright: reportUnknownMemberType=false, reportUnknownVariableType=false, reportMissingImports=false, reportUntypedFunctionDecorator=false
3129

3230

3331
class TestOTLPTraceAutoInstrumentGcpCredential(TestCase):
@@ -39,9 +37,6 @@ class TestOTLPTraceAutoInstrumentGcpCredential(TestCase):
3937
_OTEL_PYTHON_EXPORTER_OTLP_GRPC_TRACES_CREDENTIAL_PROVIDER: "gcp_grpc_credentials",
4038
},
4139
)
42-
@mark.skipif(
43-
python_implementation() == "PyPy", reason="Fails randomly in pypy"
44-
)
4540
def test_loads_otlp_exporters_with_google_creds(
4641
self, mock_default: MagicMock
4742
): # pylint: disable=no-self-use

tox.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,6 @@ envlist =
358358

359359
; opentelemetry-exporter-credential-provider-gcp
360360
py3{9,10,11,12,13}-test-exporter-credential-provider-gcp
361-
pypy3-test-exporter-credential-provider-gcp
362361
lint-exporter-credential-provider-gcp
363362

364363
; opentelemetry-util-genai

0 commit comments

Comments
 (0)