From 6fcfbd67b85e0139147b3273da97c30c4a3970a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Em=C3=ADdio=20Neto?= <9735060+emdneto@users.noreply.github.com> Date: Mon, 23 Sep 2024 04:44:07 -0300 Subject: [PATCH 1/2] tests: fix docker-tests mssql (#2878) * try new image * try new image with new pyodbc verrsion --- tests/opentelemetry-docker-tests/tests/docker-compose.yml | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/opentelemetry-docker-tests/tests/docker-compose.yml b/tests/opentelemetry-docker-tests/tests/docker-compose.yml index 2f89e3388e..59f0e42d3d 100644 --- a/tests/opentelemetry-docker-tests/tests/docker-compose.yml +++ b/tests/opentelemetry-docker-tests/tests/docker-compose.yml @@ -51,7 +51,7 @@ services: - "14268:14268" - "9411:9411" otmssql: - image: mcr.microsoft.com/mssql/server:2017-CU23-ubuntu-16.04 + image: mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04 ports: - "1433:1433" environment: diff --git a/tox.ini b/tox.ini index f7e4ce55b3..976e5968b0 100644 --- a/tox.ini +++ b/tox.ini @@ -1257,7 +1257,7 @@ deps = PyMySQL==0.10.1 PyNaCl==1.5.0 # prerequisite: install unixodbc - pyodbc==4.0.39 + pyodbc==5.0.1 pyrsistent==0.20.0 pytest==8.0.2 pytest-celery==0.0.0 From 41b64539d01b79927deb2aee1388d61021658afc Mon Sep 17 00:00:00 2001 From: heidi229 Date: Tue, 24 Sep 2024 01:09:06 +0800 Subject: [PATCH 2/2] update editable install link in readme.md (#2881) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1a2aaf4f8a..a04c4b7c7b 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ pip install opentelemetry-instrumentation-{integration} To install the development versions of these packages instead, clone or fork this repo and do an [editable -install](https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs): +install](https://pip.pypa.io/en/stable/topics/local-project-installs/#editable-installs): ```sh pip install -e ./instrumentation/opentelemetry-instrumentation-{integration}