@W-14603959 - revert of backend deps

SFDO-Tooling · Dec 19, 2023 · 7cbdf34 · 7cbdf34
1 parent c12b902
commit 7cbdf34
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 16 deletions.
diff --git a/metecho/oauth2/views.py b/metecho/oauth2/views.py
@@ -18,7 +18,7 @@ def ensure_socialapp_in_db(token):
     there are none in the db for tokens to be related to
     unless we create them here.
     """
-    if token.app.pk is None:
+    if hasattr(token.app, 'pk'):
         provider = providers.registry.get_class(token.app.provider)
         app, created = SocialApp.objects.get_or_create(
             provider=provider.id,

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -25,7 +25,9 @@ autobahn==23.6.2
     #   -c requirements/prod.txt
     #   daphne
 automat==22.10.0
-    # via twisted
+    # via
+    #   -c requirements/prod.txt
+    #   twisted
 babel==2.13.1
     # via sphinx
 black==23.11.0
@@ -47,7 +49,9 @@ click==8.1.6
     #   -c requirements/prod.txt
     #   black
 constantly==23.10.4
-    # via twisted
+    # via
+    #   -c requirements/prod.txt
+    #   twisted
 coverage[toml]==7.3.2
     # via
     #   coverage
@@ -58,11 +62,13 @@ cryptography==41.0.7
     #   autobahn
     #   pyopenssl
     #   service-identity
-daphne==4.0.0
-    # via -r requirements/dev.in
+daphne==3.0.2
+    # via
+    #   -c requirements/prod.txt
+    #   -r requirements/dev.in
 decorator==5.1.1
     # via ipython
-django~=4.2.0
+django==4.2.8
     # via
     #   -c requirements/prod.txt
     #   django-extensions
@@ -111,7 +117,9 @@ idna==3.4
 imagesize==1.4.1
     # via sphinx
 incremental==22.10.0
-    # via twisted
+    # via
+    #   -c requirements/prod.txt
+    #   twisted
 inflection==0.5.1
     # via
     #   -c requirements/prod.txt
@@ -200,7 +208,9 @@ pygments==2.17.2
     #   ipython
     #   sphinx
 pyopenssl==23.3.0
-    # via twisted
+    # via
+    #   -c requirements/prod.txt
+    #   twisted
 pytest==7.4.3
     # via
     #   -r requirements/dev.in
@@ -299,6 +309,7 @@ traitlets==5.14.0
     #   matplotlib-inline
 twisted[tls]==23.10.0
     # via
+    #   -c requirements/prod.txt
     #   daphne
     #   twisted
 txaio==23.1.1
@@ -319,7 +330,9 @@ urllib3==1.26.16
 wcwidth==0.2.12
     # via prompt-toolkit
 zope-interface==6.1
-    # via twisted
+    # via
+    #   -c requirements/prod.txt
+    #   twisted
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/requirements/prod.in b/requirements/prod.in
@@ -2,11 +2,11 @@
 # upgrade-deps.yml workflow. Avoid pinning specific versions here unless required
 # for stability.
 
-Django
+Django~=4.2.0
 autobahn
 beautifulsoup4
 bleach
-channels
+channels==3.0.5
 channels-redis
 cumulusci
 dj-database-url

diff --git a/requirements/prod.txt b/requirements/prod.txt
@@ -12,20 +12,27 @@ asgiref==3.7.2
     # via
     #   channels
     #   channels-redis
+    #   daphne
     #   django
 async-timeout==4.0.3
     # via redis
 attrs==23.1.0
     # via
+    #   automat
     #   jsonschema
     #   referencing
     #   service-identity
+    #   twisted
 authlib==1.2.1
     # via
     #   cumulusci
     #   simple-salesforce
 autobahn==23.6.2
-    # via -r requirements/prod.in
+    # via
+    #   -r requirements/prod.in
+    #   daphne
+automat==22.10.0
+    # via twisted
 beautifulsoup4==4.12.2
     # via -r requirements/prod.in
 bleach==6.1.0
@@ -42,7 +49,7 @@ cffi==1.16.0
     # via
     #   cryptography
     #   cumulusci
-channels==4.0.0
+channels==3.0.5
     # via
     #   -r requirements/prod.in
     #   channels-redis
@@ -58,6 +65,8 @@ click==8.1.6
     #   cumulusci
     #   rq
     #   snowfakery
+constantly==23.10.4
+    # via twisted
 crontab==1.0.1
     # via rq-scheduler
 cryptography==41.0.7
@@ -67,18 +76,21 @@ cryptography==41.0.7
     #   cumulusci
     #   django-anymail
     #   pyjwt
+    #   pyopenssl
     #   secretstorage
     #   service-identity
     #   sfdo-template-helpers
 cumulusci==3.83.0
     # via -r requirements/prod.in
+daphne==3.0.2
+    # via channels
 defusedxml==0.7.1
     # via
     #   cumulusci
     #   python3-openid
 dj-database-url==2.1.0
     # via -r requirements/prod.in
-django~=4.2.0
+django==4.2.8
     # via
     #   -r requirements/prod.in
     #   channels
@@ -161,17 +173,22 @@ hashids==1.3.1
 honcho==1.1.0
     # via -r requirements/prod.in
 hyperlink==21.0.0
-    # via autobahn
+    # via
+    #   autobahn
+    #   twisted
 idna==3.4
     # via
     #   cumulusci
     #   hyperlink
     #   requests
     #   snowfakery
+    #   twisted
 importlib-metadata==6.8.0
     # via
     #   cumulusci
     #   keyring
+incremental==22.10.0
+    # via twisted
 inflection==0.5.1
     # via drf-spectacular
 jeepney==0.8.0
@@ -250,6 +267,8 @@ pyjwt[crypto]==2.8.0
     #   django-allauth
     #   github3-py
     #   pyjwt
+pyopenssl==23.3.0
+    # via twisted
 python-baseconv==1.2.2
     # via
     #   cumulusci
@@ -349,7 +368,9 @@ selenium==3.141.0
 sentry-sdk==1.38.0
     # via -r requirements/prod.in
 service-identity==23.1.0
-    # via -r requirements/prod.in
+    # via
+    #   -r requirements/prod.in
+    #   twisted
 sfdo-template-helpers @ https://github.com/SFDO-Tooling/sfdo-template-helpers/archive/v0.20.0.tar.gz
     # via -r requirements/prod.in
 simple-salesforce==1.11.4
@@ -358,6 +379,7 @@ simple-salesforce==1.11.4
     #   salesforce-bulk
 six==1.16.0
     # via
+    #   automat
     #   bleach
     #   cumulusci
     #   fs
@@ -376,6 +398,10 @@ sqlalchemy==1.4.49
     #   snowfakery
 sqlparse==0.4.4
     # via django
+twisted[tls]==23.10.0
+    # via
+    #   daphne
+    #   twisted
 txaio==23.1.1
     # via autobahn
 typing-extensions==4.7.1
@@ -385,6 +411,7 @@ typing-extensions==4.7.1
     #   dj-database-url
     #   pydantic
     #   snowfakery
+    #   twisted
 unicodecsv==0.14.1
     # via
     #   cumulusci
@@ -412,6 +439,8 @@ zipp==3.17.0
     # via
     #   cumulusci
     #   importlib-metadata
+zope-interface==6.1
+    # via twisted
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools