Merge branch 'main' into avoid-loosing-repeated-headers

Author: lzchen

instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml

@@ -32,9 +32,6 @@ dependencies = [
 
 [project.optional-dependencies]
 instruments = []
-test = [
-  "opentelemetry-test-utils == 0.45b0.dev",
-]
 
 [project.urls]
 Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-dbapi"

instrumentation/opentelemetry-instrumentation-dbapi/test-requirements.txt

@@ -0,0 +1,17 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.9.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-dbapi

instrumentation/opentelemetry-instrumentation-sqlalchemy/pyproject.toml

@@ -35,11 +35,6 @@ dependencies = [
 instruments = [
   "sqlalchemy",
 ]
-test = [
-  "opentelemetry-instrumentation-sqlalchemy[instruments]",
-  "opentelemetry-sdk ~= 1.12",
-  "pytest",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 sqlalchemy = "opentelemetry.instrumentation.sqlalchemy:SQLAlchemyInstrumentor"

instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-0.txt

@@ -0,0 +1,22 @@
+asgiref==3.7.2
+attrs==23.2.0
+cffi==1.15.1
+Deprecated==1.2.14
+greenlet==0.4.13
+hpy==0.0.4.dev179+g9b5d200
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+readline==6.2.4.1
+SQLAlchemy==1.1.18
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-sqlalchemy

instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt

@@ -0,0 +1,20 @@
+aiosqlite==0.20.0
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+greenlet==3.0.3
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+SQLAlchemy==1.4.51
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-sqlalchemy

tox.ini

@@ -207,8 +207,12 @@ envlist =
     pypy3-test-instrumentation-grpc
 
     ; opentelemetry-instrumentation-sqlalchemy
-    py3{8,9,10,11}-test-instrumentation-sqlalchemy-{14}
-    pypy3-test-instrumentation-sqlalchemy-{11,14}
+    ; The numbers at the end of the environment names
+    ; below mean these dependencies are being used:
+    ; 0: sqlalchemy>=1.1,<1.2
+    ; 1: sqlalchemy~=1.4 aiosqlite
+    py3{8,9,10,11}-test-instrumentation-sqlalchemy-{1}
+    pypy3-test-instrumentation-sqlalchemy-{0,1}
 
     ; opentelemetry-instrumentation-redis
     py3{8,9,10,11}-test-instrumentation-redis
@@ -296,9 +300,6 @@ deps =
   coverage: pytest
   coverage: pytest-cov
   grpc: pytest-asyncio
-  sqlalchemy-11: sqlalchemy>=1.1,<1.2
-  sqlalchemy-14: aiosqlite
-  sqlalchemy-14: sqlalchemy~=1.4
   sio-pika-0: pika>=0.12.0,<1.0.0
   sio-pika-1: pika>=1.0.0
 
@@ -368,7 +369,7 @@ commands_pre =
 
   cassandra: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra[test]
 
-  dbapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi[test]
+  dbapi: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi/test-requirements.txt
 
   py3{8,9}-test-instrumentation-django-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-0.txt
   py3{8,9}-test-instrumentation-django-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt
@@ -434,7 +435,8 @@ commands_pre =
 
   sklearn: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn[test]
 
-  sqlalchemy-{11,14}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]
+  sqlalchemy-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-0.txt
+  sqlalchemy-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt
 
   elasticsearch-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-0.txt
   elasticsearch-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-1.txt
@@ -562,8 +564,8 @@ commands_pre =
   python -m pip install -e {toxinidir}/util/opentelemetry-util-http[test]
   python -m pip install -e {toxinidir}/opentelemetry-instrumentation[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi/test-requirements.txt
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi/test-requirements.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt
@@ -572,7 +574,7 @@ commands_pre =
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-boto[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-2.txt
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-celery[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]