Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 47 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,39 @@ jobs:
- store-pytest-results
- store-coverage-report

python3150:
parameters:
docker:
- image: ghcr.io/pvital/pvital-python:latest
- image: public.ecr.aws/docker/library/postgres:16.10-trixie
environment:
POSTGRES_USER: root
POSTGRES_PASSWORD: passw0rd
POSTGRES_DB: instana_test_db
- image: public.ecr.aws/docker/library/mariadb:11.3.2
environment:
MYSQL_ROOT_PASSWORD: passw0rd
MYSQL_DATABASE: instana_test_db
- image: public.ecr.aws/docker/library/redis:7.2.4-bookworm
- image: public.ecr.aws/docker/library/rabbitmq:3.13.0
- image: public.ecr.aws/docker/library/mongo:7.0.6
- image: quay.io/thekevjames/gcloud-pubsub-emulator:latest
environment:
PUBSUB_EMULATOR_HOST: 0.0.0.0:8681
PUBSUB_PROJECT1: test-project,test-topic
working_directory: ~/repo
steps:
- checkout
- check-if-tests-needed
- run: |
cp -a /root/base/venv ./venv
. venv/bin/activate
pip install -r requirements.txt
- run-tests-with-coverage-report:
gevent: "true"
- store-pytest-results
- store-coverage-report

final_job:
docker:
- image: public.ecr.aws/docker/library/python:3.13
Expand All @@ -289,23 +322,24 @@ workflows:
tests:
max_auto_reruns: 2
jobs:
- python3x:
matrix:
parameters:
py-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
- py39cassandra
- py39gevent
- py312aws
- py313kafka
#- python3x:
# matrix:
# parameters:
# py-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
#- py39cassandra
#- py39gevent
#- py312aws
#- py313kafka
- autowrapt:
matrix:
parameters:
py-version: ["3.11", "3.12", "3.13", "3.14"]
- python3150
- final_job:
requires:
- python3x
- py39cassandra
- py39gevent
- py312aws
- py313kafka
#- python3x
#- py39cassandra
#- py39gevent
#- py312aws
#- py313kafka
- autowrapt
9 changes: 0 additions & 9 deletions tests/clients/test_google-cloud-storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# (c) Copyright Instana Inc. 2020


import sys
from typing import Generator
import json
import pytest
Expand Down Expand Up @@ -541,10 +540,6 @@ def test_objects_attrs(self, mock_requests: Mock) -> None:
assert gcs_span.data["gcs"]["bucket"] == "test bucket"
assert gcs_span.data["gcs"]["object"] == "test object"

@pytest.mark.skipif(
sys.version_info >= (3, 14),
reason='Avoiding "Fatal Python error: Segmentation fault"',
)
@patch("requests.Session.request")
def test_objects_get(self, mock_requests: Mock) -> None:
mock_requests.return_value = self._mock_response(
Expand Down Expand Up @@ -1084,10 +1079,6 @@ def test_execute_with_instana_is_tracing_off(self) -> None:
response = client.list_buckets()
assert isinstance(response.client, storage.Client)

@pytest.mark.skipif(
sys.version_info >= (3, 14),
reason='Avoiding "Fatal Python error: Segmentation fault"',
)
@patch("requests.Session.request")
def test_download_with_instana_is_tracing_off(self, mock_requests: Mock) -> None:
mock_requests.return_value = self._mock_response(
Expand Down
12 changes: 6 additions & 6 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,15 @@
collect_ignore_glob.append("*test_spyne*")


if sys.version_info >= (3, 14):
if sys.version_info >= (3, 15):
collect_ignore_glob.extend(
[
# Currently not installable dependencies because of 3.14 incompatibilities
# Currently not installable dependencies because of 3.15 incompatibilities
"*test_fastapi*",
# aiohttp-server tests failing due to deprecated methods used
"*test_aiohttp_server*",
# Currently Sanic does not support python >= 3.14
"*test_sanic*",
# Development version of Python always break logging tests, so we skip then
"*test_logging*",
# Removing TestAioPika due to "Too long with no output" errors
"*test_aio_pika*",
]
)

Expand Down
43 changes: 0 additions & 43 deletions tests/requirements-pre314.txt

This file was deleted.

Loading