diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 01ce3922d1..8200223f06 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2983,31 +2983,6 @@ jobs: - name: Run tests run: tox -e py314-test-opentelemetry-test-utils -- -ra - py314t-test-opentelemetry-test-utils_ubuntu-latest: - name: opentelemetry-test-utils 3.14t Ubuntu - runs-on: ubuntu-latest - timeout-minutes: 30 - steps: - - name: Checkout repo @ SHA - ${{ github.sha }} - uses: actions/checkout@v4 - - - name: Install weaver - run: | - WEAVER_URL="https://github.com/open-telemetry/weaver/releases/download/${{ env.WEAVER_VERSION }}/weaver-x86_64-unknown-linux-gnu.tar.xz" - curl -sSL "$WEAVER_URL" | tar -xJ -C /tmp weaver-x86_64-unknown-linux-gnu/weaver - sudo mv /tmp/weaver-x86_64-unknown-linux-gnu/weaver /usr/local/bin/weaver - - - name: Set up Python 3.14t - uses: actions/setup-python@v5 - with: - python-version: "3.14t" - - - name: Install tox - run: pip install tox-uv - - - name: Run tests - run: tox -e py314t-test-opentelemetry-test-utils -- -ra - pypy3-test-opentelemetry-test-utils_ubuntu-latest: name: opentelemetry-test-utils pypy-3.10 Ubuntu runs-on: ubuntu-latest @@ -6260,27 +6235,6 @@ jobs: - name: Run tests run: tox -e py314-test-opentelemetry-test-utils -- -ra - py314t-test-opentelemetry-test-utils_windows-latest: - name: opentelemetry-test-utils 3.14t Windows - runs-on: windows-latest - timeout-minutes: 30 - steps: - - name: Configure git to support long filenames - run: git config --system core.longpaths true - - name: Checkout repo @ SHA - ${{ github.sha }} - uses: actions/checkout@v4 - - - name: Set up Python 3.14t - uses: actions/setup-python@v5 - with: - python-version: "3.14t" - - - name: Install tox - run: pip install tox-uv - - - name: Run tests - run: tox -e py314t-test-opentelemetry-test-utils -- -ra - pypy3-test-opentelemetry-test-utils_windows-latest: name: opentelemetry-test-utils pypy-3.10 Windows runs-on: windows-latest diff --git a/tests/opentelemetry-test-utils/test-requirements.txt b/tests/opentelemetry-test-utils/test-requirements.txt index 87de9a5f95..6b4dbcec04 100644 --- a/tests/opentelemetry-test-utils/test-requirements.txt +++ b/tests/opentelemetry-test-utils/test-requirements.txt @@ -13,9 +13,9 @@ zipp==3.19.2 -e opentelemetry-sdk -e opentelemetry-semantic-conventions -e tests/opentelemetry-test-utils -# these are required for weaver integration tests, we're running that only on linux +# these are required for weaver integration tests, we're running that only on linux / CPython # because of lack of support for gRPC on Windows in some cases. # note: tox does not support PEP 508 markers on `-e` editable installs, so these are installed non-editable -./opentelemetry-proto ; sys_platform != 'win32' -./exporter/opentelemetry-exporter-otlp-proto-common ; sys_platform != 'win32' -./exporter/opentelemetry-exporter-otlp-proto-grpc ; sys_platform != 'win32' \ No newline at end of file +./opentelemetry-proto ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' +./exporter/opentelemetry-exporter-otlp-proto-common ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' +./exporter/opentelemetry-exporter-otlp-proto-grpc ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' diff --git a/tox.ini b/tox.ini index 4320dce733..d1c5aff8c9 100644 --- a/tox.ini +++ b/tox.ini @@ -92,7 +92,8 @@ envlist = pypy3-test-opentelemetry-propagator-jaeger lint-opentelemetry-propagator-jaeger - py3{10,11,12,13,14,14t}-test-opentelemetry-test-utils + ; skip py314t until grpc gets wheels for it or we stop using grpc exporter in weaver tests + py3{10,11,12,13,14}-test-opentelemetry-test-utils pypy3-test-opentelemetry-test-utils lint-opentelemetry-test-utils