From 2f430a24235f2dabf2d80b47c4b038cf338d29d3 Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Wed, 11 Oct 2023 00:40:26 -0400 Subject: [PATCH] Revert "build: Remove sqlalchemy (added in a first commit e0fef4a) and markdown. Add direct dependencies." This reverts commit a618297483654dbad24bdbc4215374910ade653d. --- requirements.in | 6 ++---- requirements.txt | 12 ++++++------ requirements_dev.txt | 5 +++++ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/requirements.in b/requirements.in index 2b13cdd..c142a95 100644 --- a/requirements.in +++ b/requirements.in @@ -1,8 +1,6 @@ -asgiref celery[django] channels[daphne] channels_redis -daphne dj-database-url django django-celery-beat @@ -12,10 +10,10 @@ django-transfer djangorestframework drf-nested-routers ijson -jsonref -ocdsextensionregistry +markdown psycopg2 redis requests sentry-sdk +sqlalchemy spoonbill diff --git a/requirements.txt b/requirements.txt index db7bbe6..e9f30e1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,6 @@ amqp==5.1.1 # via kombu asgiref==3.7.2 # via - # -r requirements.in # channels # channels-redis # daphne @@ -73,9 +72,7 @@ cryptography==41.0.4 # pyopenssl # service-identity daphne==4.0.0 - # via - # -r requirements.in - # channels + # via channels dj-database-url==2.1.0 # via -r requirements.in django==4.2.4 @@ -128,18 +125,18 @@ json-merge-patch==0.2 # via ocdsextensionregistry jsonref==1.1.0 # via - # -r requirements.in # ocdsextensionregistry # ocdskit # ocdsmerge # spoonbill kombu==5.3.1 # via celery +markdown==3.4.4 + # via -r requirements.in msgpack==1.0.5 # via channels-redis ocdsextensionregistry==0.3.8 # via - # -r requirements.in # ocdskit # spoonbill ocdskit==1.1.8 @@ -200,6 +197,8 @@ six==1.16.0 # url-normalize spoonbill==1.0.12 # via -r requirements.in +sqlalchemy==2.0.20 + # via -r requirements.in sqlparse==0.4.4 # via django twisted[tls]==22.10.0 @@ -209,6 +208,7 @@ txaio==23.1.1 typing-extensions==4.7.1 # via # dj-database-url + # sqlalchemy # twisted tzdata==2023.3 # via diff --git a/requirements_dev.txt b/requirements_dev.txt index 96034ea..046a2f1 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -208,6 +208,8 @@ kombu==5.3.1 # via # -r requirements.txt # celery +markdown==3.4.4 + # via -r requirements.txt mccabe==0.6.1 # via flake8 msgpack==1.0.5 @@ -350,6 +352,8 @@ six==1.16.0 # virtualenv spoonbill==1.0.12 # via -r requirements.txt +sqlalchemy==2.0.20 + # via -r requirements.txt sqlparse==0.4.4 # via # -r requirements.txt @@ -368,6 +372,7 @@ typing-extensions==4.7.1 # via # -r requirements.txt # dj-database-url + # sqlalchemy # twisted tzdata==2023.3 # via