From ad38ac7b37a4e8b9807a6e5088520e4c58f6663d Mon Sep 17 00:00:00 2001 From: Michael Harrison Date: Thu, 17 Jun 2021 10:42:04 -0500 Subject: [PATCH 1/2] upgrade wagtail to 2.13.1 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index dc0a32c08..b062f35ef 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -66,7 +66,7 @@ six==1.14.0 sphinx-me==0.3 sqlparse==0.3.0 Unidecode==1.1.1 -wagtail==2.11.3 +wagtail==2.13.1 wheel==0.24.0 whitenoise==5.2.0 Willow==1.4 From 9ea3c99e9ad2d8df4213f15a4bd1d4c51068f8c0 Mon Sep 17 00:00:00 2001 From: Michael Harrison Date: Thu, 17 Jun 2021 12:23:00 -0500 Subject: [PATCH 2/2] upgrade django to 3.2.4 --- duplicatebooks/wagtail_hooks.py | 4 ++-- openstax/settings/base.py | 2 ++ requirements/base.txt | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/duplicatebooks/wagtail_hooks.py b/duplicatebooks/wagtail_hooks.py index 47a23eb20..0ca264ca8 100644 --- a/duplicatebooks/wagtail_hooks.py +++ b/duplicatebooks/wagtail_hooks.py @@ -15,6 +15,6 @@ def register_admin_urls(): ] @hooks.register('register_page_listing_more_buttons') -def page_listing_more_buttons(page, page_perms, is_parent=False): +def page_listing_more_buttons(page, page_perms, is_parent=False, next_url=None): if page.__class__.__name__ == "Book": - yield wagtailadmin_widgets.Button('Duplicate Book', reverse('duplicatebooks_admin:duplicate', args=[page.id]), priority=1) \ No newline at end of file + yield wagtailadmin_widgets.Button('Duplicate Book', reverse('duplicatebooks_admin:duplicate', args=[page.id]), priority=1) diff --git a/openstax/settings/base.py b/openstax/settings/base.py index 2e59ce65d..6bd015f26 100644 --- a/openstax/settings/base.py +++ b/openstax/settings/base.py @@ -38,6 +38,8 @@ } } +DEFAULT_AUTO_FIELD='django.db.models.AutoField' + # Local time zone for this installation. TIME_ZONE = 'America/Chicago' diff --git a/requirements/base.txt b/requirements/base.txt index b062f35ef..659c89b97 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ appdirs==1.4.3 -asgiref==3.2.5 +asgiref==3.3.4 beautifulsoup4==4.8.2 boto==2.49.0 boto3==1.14.51 @@ -9,7 +9,7 @@ certifi==2020.11.8 chardet==3.0.4 cryptography==3.3.2 defusedxml==0.6.0 -Django==3.0.4 +Django==3.2.4 django-admin-view-permission==1.5 django-appconf==1.0.3 django-cachalot==1.5.0 @@ -23,7 +23,7 @@ django-rest-auth==0.6.0 django-taggit==1.2.0 django-treebeard==4.3.1 django-storages==1.8.0 -django-flags==5.0.2 +django-flags==5.0.5 django-reversion==3.0.8 djangorestframework==3.12.2 docutils==0.15.2