Merge branch 'main' into check_collectstatic

python · Sep 13, 2024 · 555fe60 · 555fe60
2 parents 42bda2e + 68fa4c1
commit 555fe60
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,2 @@
+# Notify @EWDurbin for all opened Issues and Pull Requests
+*	@EWDurbin @JacobCoffee
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,19 @@
+<!--
+By submitting this pull request, you agree to:
+- follow the [PSF's Code of Conduct](https://www.python.org/psf/conduct/)
+-->
+#### Description
+
+-
+
+<!--
+If applicable, please add in issue numbers this pull request will close, if applicable
+Examples: Fixes #4321 or Closes #1234
+
+Ensure you are using a supported keyword to properly link an issue:
+https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword
+-->
+#### Closes
+
+- 
+
diff --git a/base-requirements.txt b/base-requirements.txt
@@ -36,7 +36,7 @@ requests[security]>=2.26.0
 django-honeypot==1.0.4  # 1.0.4 is first version that supports Django 4.2
 django-markupfield==2.0.1
 
-django-allauth==0.57.2 # 0.55.0 is first version that supports Django 4.2
+django-allauth==64.2.1
 
 django-waffle==2.2.1
 

diff --git a/pydotorg/settings/base.py b/pydotorg/settings/base.py
@@ -230,11 +230,6 @@
 
     'allauth',
     'allauth.account',
-    'allauth.socialaccount',
-    #'allauth.socialaccount.providers.facebook',
-    #'allauth.socialaccount.providers.github',
-    #'allauth.socialaccount.providers.openid',
-    #'allauth.socialaccount.providers.twitter',
 
     # Tastypie needs the `users` app to be already loaded.
     'tastypie',