Merge remote-tracking branch 'origin/main' into release

python · Sep 13, 2024 · 4857d9b · 4857d9b
2 parents 2f196fa + 019c062
commit 4857d9b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ default:
 	@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null\
         | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}'\
         | sort\
-        | egrep -v -e '^[^[:alnum:]]' -e '^$@$$'
+        | grep -E -v -e '^[^[:alnum:]]' -e '^$@$$'
 	@echo
 	@exit 1
 

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/docs/source/administration.rst b/docs/source/administration.rst
@@ -46,7 +46,7 @@ Pages are individual entire pages of markup content.  They are require ``Title``
 :Is Published: Controls whether or not the page is visible on the site.
 :Template Name: By default Pages use the template ``templates/pages/default.html`` to use a different template enter the template path here.
 
-.. note:: Pages are automatically purge from Fastly.com upon save.
+.. note:: Pages are automatically purged from Fastly.com upon save.
 
 .. _boxes:
 
@@ -82,7 +82,7 @@ Release Files have a checkbox named 'Download button' that determines which bina
 Jobs
 ----
 
-The jobs application is using to display Python jobs on the site. The data items should be fairly self explanatory. There are a couple of things to keep in mind. Logged in users of the site can submit jobs for review.
+The jobs application is used to display Python jobs on the site. The data items should be fairly self explanatory. There are a couple of things to keep in mind. Logged in users of the site can submit jobs for review.
 
 :Status: Jobs enter the system in 'review' status after the submitter has entered them. Only jobs in the 'approved' state are displayed on the site.
 :Featured: Featured jobs are displayed more prominently on the landing page.

diff --git a/jobs/tests/test_models.py b/jobs/tests/test_models.py
@@ -76,7 +76,7 @@ def test_visible_manager(self):
         j3 = factories.ApprovedJobFactory(expires=past)
 
         visible = Job.objects.visible()
-        self.assertTrue(len(visible), 1)
+        self.assertEqual(len(visible), 1)
         self.assertIn(j1, visible)
         self.assertNotIn(j2, visible)
         self.assertNotIn(j3, visible)

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',