diff options
| author | Rick Elrod <rick@elrod.me> | 2023-05-10 16:10:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-10 16:10:35 +0200 |
| commit | 74c46568c1650f33a96884839c921a9dfe04b483 (patch) | |
| tree | 4db2faa5d16f564da80e552fa2f0c9e5931bb98f /requirements | |
| parent | Merge pull request #13963 from Akasurde/doc_fix (diff) | |
| download | awx-74c46568c1650f33a96884839c921a9dfe04b483.tar.xz awx-74c46568c1650f33a96884839c921a9dfe04b483.zip | |
[wsrelay] switch from psycopg 3 to asyncpg (#13965)
Due to dependency issues specifically around upgrading to Django 4.2, we
cannot feasibly have a dependency on psycopg2 and psycopg3. The only
place that was currently using psycopg3 was wsrelay.
Change wsrelay to use the asyncpg library and psycopg2 instead.
Tested locally on kind with a dev build of awx.
Signed-off-by: Rick Elrod <rick@elrod.me>
Diffstat (limited to 'requirements')
| -rw-r--r-- | requirements/requirements.in | 2 | ||||
| -rw-r--r-- | requirements/requirements.txt | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/requirements/requirements.in b/requirements/requirements.in index 72bdfd6db0..0c74b18384 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -2,6 +2,7 @@ aiohttp ansiconv==1.0.0 # UPGRADE BLOCKER: from 2013, consider replacing instead of upgrading asciichartpy asn1 +asyncpg azure-keyvault==1.1.0 # see UPGRADE BLOCKERs channels channels-redis==3.4.1 # see UPGRADE BLOCKERs @@ -36,7 +37,6 @@ openshift pexpect==4.7.0 # see library notes prometheus_client psycopg2 -psycopg # psycopg3 is used to listen for pg_notify messages from web servers in awx.main.wsrelay where asyncio is used psutil pygerduty pyparsing==2.4.6 # Upgrading to v3 of pyparsing introduce errors on smart host filtering: Expected 'or' term, found 'or' (at char 15), (line:1, col:16) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 4b74fe3119..e25097230d 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -24,6 +24,8 @@ async-timeout==4.0.2 # aiohttp # aioredis # redis +asyncpg==0.27.0 + # via -r /awx_devel/requirements/requirements.in attrs==22.1.0 # via # aiohttp @@ -266,8 +268,6 @@ prometheus-client==0.15.0 # via -r /awx_devel/requirements/requirements.in psutil==5.9.4 # via -r /awx_devel/requirements/requirements.in -psycopg==3.1.4 - # via -r /awx_devel/requirements/requirements.in psycopg2==2.9.5 # via -r /awx_devel/requirements/requirements.in ptyprocess==0.7.0 @@ -428,7 +428,7 @@ txaio==22.2.1 typing-extensions==4.4.0 # via # azure-core - # psycopg + # pydantic # setuptools-rust # setuptools-scm # twisted |