Require aiopg to be less than 1.3.0 (open-telemetry#560)

open-o11y · Jul 1, 2021 · 1a62f69 · 1a62f69
1 parent 0bc5fd5
commit 1a62f69
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#538](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/538))
 - Changed the psycopg2-binary to psycopg2 as dependency in production
   ([#543](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/543))
+- Require aiopg to be less than 1.3.0
+  ([#560](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/560))
 
 ### Added
 - `opentelemetry-instrumentation-httpx` Add `httpx` instrumentation

diff --git a/docs-requirements.txt b/docs-requirements.txt
@@ -19,7 +19,7 @@ django>=2.2
 
 # Required by instrumentation and exporter packages
 aiohttp~=3.0
-aiopg>=0.13.0
+aiopg>=0.13.0,<1.3.0
 asyncpg>=0.12.0
 boto~=2.0
 botocore~=1.0

diff --git a/...on/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/package.py b/...on/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/package.py
@@ -13,4 +13,4 @@
 # limitations under the License.
 
 
-_instruments = ("aiopg >= 0.13.0",)
+_instruments = ("aiopg >= 0.13.0, < 1.3.0",)
diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py
@@ -21,7 +21,7 @@
         "instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.23.dev0",
     },
     "aiopg": {
-        "library": "aiopg >= 0.13.0",
+        "library": "aiopg >= 0.13.0, < 1.3.0",
         "instrumentation": "opentelemetry-instrumentation-aiopg==0.23.dev0",
     },
     "asgiref": {

diff --git a/tox.ini b/tox.ini
@@ -404,7 +404,7 @@ deps =
   pymongo ~= 3.1
   PyMySQL ~= 0.10.1
   psycopg2 ~= 2.8.4
-  aiopg >= 0.13.0
+  aiopg >= 0.13.0, < 1.3.0
   sqlalchemy ~= 1.3.16
   redis ~= 3.3.11
   celery[pytest] >= 4.0, < 6.0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,4 @@
		# limitations under the License.


		_instruments = ("aiopg >= 0.13.0",)
		_instruments = ("aiopg >= 0.13.0, < 1.3.0",)