From c2644f4abc1efe26fa0e08ab4a0f677592cc3060 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Fri, 16 Feb 2024 16:33:46 -0600
Subject: [PATCH] Remove [test] package from aiopg instrumentation

Fixes #2185
---
 .../pyproject.toml                            |  5 -----
 .../test-requirements.txt                     | 22 +++++++++++++++++++
 tox.ini                                       |  6 ++---
 3 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt

diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml
index bd1c415226..b85dedb1d6 100644
--- a/instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml
@@ -34,11 +34,6 @@ dependencies = [
 instruments = [
   "aiopg >= 0.13.0, < 2.0.0",
 ]
-test = [
-  "opentelemetry-instrumentation-aiopg[instruments]",
-  "opentelemetry-semantic-conventions == 0.44b0.dev",
-  "opentelemetry-test-utils == 0.44b0.dev",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 aiopg = "opentelemetry.instrumentation.aiopg:AiopgInstrumentor"
diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt
new file mode 100644
index 0000000000..93e3631565
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt
@@ -0,0 +1,22 @@
+aiopg==1.4.0
+asgiref==3.7.2
+async-timeout==4.0.3
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+install==1.3.5
+packaging==23.2
+pluggy==1.4.0
+psycopg2-binary==2.9.9
+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.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e ../../../opentelemetry-instrumentation
+-e ../../../instrumentation/opentelemetry-instrumentation-dbapi
+-e ../../../instrumentation/opentelemetry-instrumentation-aiopg
diff --git a/tox.ini b/tox.ini
index 74f785974d..232cc665cd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -457,7 +457,7 @@ commands_pre =
 
   aiohttp-server: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server[test]
 
-  aiopg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg[test]
+  aiopg: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt
 
   richconsole: pip install flaky {toxinidir}/exporter/opentelemetry-exporter-richconsole[test]
 
@@ -558,7 +558,7 @@ commands_pre =
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server[test]
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg[test]
+  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-requests[test]
@@ -603,7 +603,7 @@ deps =
   # see https://www.psycopg.org/docs/install.html#build-prerequisites
   # you might have to install additional packages depending on your OS
   psycopg2 ~= 2.9.5
-  aiopg >= 0.13.0, < 1.3.0
+  aiopg==1.4.0
   sqlalchemy ~= 1.4
   redis ~= 4.3
   celery[pytest] >= 4.0, < 6.0