Merge branch 'main' into per-package-release-2

open-telemetry · Sep 23, 2024 · 4a52f46 · 4a52f46
2 parents 1a82473 + 41b6453
commit 4a52f46
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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}

diff --git 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
@@ -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