Merge pull request #84 from springload/feature/BED-upgrade

CMS/Project Upgrade

constraints.txt

@@ -1,20 +1,23 @@
+anyascii==0.1.7
 beautifulsoup4==4.8.2
 boto3==1.15.1
 botocore==1.18.1
 certifi==2020.6.20
 chardet==3.0.4
 dj-database-url==0.5.0
-Django==2.2.16
-django-analytical==2.6.0
+Django==2.2.19
+django-analytical==3.0.0
 django-appconf==1.0.4
 django-compressor==2.4
+django-filter==2.4.0
 django-libsass==0.8
 django-modelcluster==5.1
 django-storages==1.7.2
 django-taggit==1.3.0
 django-treebeard==4.3.1
-djangorestframework==3.11.1
+djangorestframework==3.12.2
 draftjs-exporter==2.1.7
+et-xmlfile==1.0.1
 future==0.18.2
 html5lib==1.1
 idna==2.10
@@ -23,8 +26,9 @@ l18n==2018.5
 libsass==0.20.1
 mbstrdecoder==1.0.0
 mod-wsgi==4.7.1
+openpyxl==3.0.7
 Pillow==7.2.0
-psycopg2==2.8.6
+psycopg2-binary==2.8.6
 python-dateutil==2.8.1
 pytz==2020.1
 rcssmin==1.0.6
@@ -34,12 +38,15 @@ s3transfer==0.3.3
 six==1.15.0
 soupsieve==2.0.1
 sqlparse==0.3.1
-tqdm==4.49.0
+tablib==3.0.0
+tqdm==4.59.0
 typed-environment-configuration==0.1.3
 typepy==0.2.5
 Unidecode==1.1.1
 urllib3==1.25.10
-wagtail==2.9.3
+wagtail==2.11.6
 webencodings==0.5.1
-Willow==1.3
+Willow==1.4
+xlrd==2.0.1
 XlsxWriter==1.3.3
+xlwt==1.3.0

ietf/blog/migrations/0002_auto_20210325_0442.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.2.16 on 2021-03-25 04:42
+
+from django.db import migrations
+import wagtail.contrib.table_block.blocks
+import wagtail.core.blocks
+import wagtail.core.fields
+import wagtail.embeds.blocks
+import wagtail.images.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blog', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='blogpage',
+            name='body',
+            field=wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock(icon='title')), ('paragraph', wagtail.core.blocks.RichTextBlock(icon='pilcrow')), ('image', wagtail.images.blocks.ImageChooserBlock(icon='image', template='includes/imageblock.html')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='code')), ('raw_html', wagtail.core.blocks.RawHTMLBlock(icon='placeholder')), ('table', wagtail.contrib.table_block.blocks.TableBlock(table_options={'renderer': 'html'}, template='includes/tableblock.html'))]),
+        ),
+    ]

ietf/events/migrations/0002_auto_20210325_0442.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.2.16 on 2021-03-25 04:42
+
+from django.db import migrations
+import wagtail.contrib.table_block.blocks
+import wagtail.core.blocks
+import wagtail.core.fields
+import wagtail.embeds.blocks
+import wagtail.images.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('events', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='eventpage',
+            name='body',
+            field=wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock(icon='title')), ('paragraph', wagtail.core.blocks.RichTextBlock(icon='pilcrow')), ('image', wagtail.images.blocks.ImageChooserBlock(icon='image', template='includes/imageblock.html')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='code')), ('raw_html', wagtail.core.blocks.RawHTMLBlock(icon='placeholder')), ('table', wagtail.contrib.table_block.blocks.TableBlock(table_options={'renderer': 'html'}, template='includes/tableblock.html'))]),
+        ),
+    ]

ietf/forms/migrations/0002_formfield_clean_name.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.19 on 2021-03-25 05:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('forms', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='formfield',
+            name='clean_name',
+            field=models.CharField(blank=True, default='', help_text='Safe name of the form field, the label converted to ascii_snake_case', max_length=255, verbose_name='name'),
+        ),
+    ]

ietf/forms/models.py

@@ -9,6 +9,10 @@
 class FormField(AbstractFormField):
     page = ParentalKey('FormPage', related_name='form_fields')
 
+    @classmethod
+    def _migrate_legacy_clean_name(cls):
+        return None
+
 
 class FormPage(AbstractEmailForm):
     intro = RichTextField(blank=True)

ietf/iesg_statement/migrations/0002_auto_20210325_0442.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.2.16 on 2021-03-25 04:42
+
+from django.db import migrations
+import wagtail.contrib.table_block.blocks
+import wagtail.core.blocks
+import wagtail.core.fields
+import wagtail.embeds.blocks
+import wagtail.images.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('iesg_statement', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='iesgstatementpage',
+            name='body',
+            field=wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock(icon='title')), ('paragraph', wagtail.core.blocks.RichTextBlock(icon='pilcrow')), ('image', wagtail.images.blocks.ImageChooserBlock(icon='image', template='includes/imageblock.html')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='code')), ('raw_html', wagtail.core.blocks.RawHTMLBlock(icon='placeholder')), ('table', wagtail.contrib.table_block.blocks.TableBlock(table_options={'renderer': 'html'}, template='includes/tableblock.html'))]),
+        ),
+    ]

ietf/standard/migrations/0002_auto_20210325_0442.py

@@ -0,0 +1,38 @@
+# Generated by Django 2.2.16 on 2021-03-25 04:42
+
+from django.db import migrations
+import wagtail.contrib.table_block.blocks
+import wagtail.core.blocks
+import wagtail.core.fields
+import wagtail.embeds.blocks
+import wagtail.images.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('standard', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='standardindexpage',
+            name='in_depth',
+            field=wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock(icon='title')), ('paragraph', wagtail.core.blocks.RichTextBlock(icon='pilcrow')), ('image', wagtail.images.blocks.ImageChooserBlock(icon='image', template='includes/imageblock.html')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='code')), ('raw_html', wagtail.core.blocks.RawHTMLBlock(icon='placeholder')), ('table', wagtail.contrib.table_block.blocks.TableBlock(table_options={'renderer': 'html'}, template='includes/tableblock.html'))], blank=True),
+        ),
+        migrations.AlterField(
+            model_name='standardindexpage',
+            name='key_info',
+            field=wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock(icon='title')), ('paragraph', wagtail.core.blocks.RichTextBlock(icon='pilcrow')), ('image', wagtail.images.blocks.ImageChooserBlock(icon='image', template='includes/imageblock.html')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='code')), ('raw_html', wagtail.core.blocks.RawHTMLBlock(icon='placeholder')), ('table', wagtail.contrib.table_block.blocks.TableBlock(table_options={'renderer': 'html'}, template='includes/tableblock.html'))], blank=True),
+        ),
+        migrations.AlterField(
+            model_name='standardpage',
+            name='in_depth',
+            field=wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock(icon='title')), ('paragraph', wagtail.core.blocks.RichTextBlock(icon='pilcrow')), ('image', wagtail.images.blocks.ImageChooserBlock(icon='image', template='includes/imageblock.html')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='code')), ('raw_html', wagtail.core.blocks.RawHTMLBlock(icon='placeholder')), ('table', wagtail.contrib.table_block.blocks.TableBlock(table_options={'renderer': 'html'}, template='includes/tableblock.html'))], blank=True),
+        ),
+        migrations.AlterField(
+            model_name='standardpage',
+            name='key_info',
+            field=wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock(icon='title')), ('paragraph', wagtail.core.blocks.RichTextBlock(icon='pilcrow')), ('image', wagtail.images.blocks.ImageChooserBlock(icon='image', template='includes/imageblock.html')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='code')), ('raw_html', wagtail.core.blocks.RawHTMLBlock(icon='placeholder')), ('table', wagtail.contrib.table_block.blocks.TableBlock(table_options={'renderer': 'html'}, template='includes/tableblock.html'))], blank=True),
+        ),
+    ]

ietf/topics/migrations/0002_auto_20210325_0442.py

@@ -0,0 +1,28 @@
+# Generated by Django 2.2.16 on 2021-03-25 04:42
+
+from django.db import migrations
+import wagtail.contrib.table_block.blocks
+import wagtail.core.blocks
+import wagtail.core.fields
+import wagtail.embeds.blocks
+import wagtail.images.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('topics', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='primarytopicpage',
+            name='in_depth',
+            field=wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock(icon='title')), ('paragraph', wagtail.core.blocks.RichTextBlock(icon='pilcrow')), ('image', wagtail.images.blocks.ImageChooserBlock(icon='image', template='includes/imageblock.html')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='code')), ('raw_html', wagtail.core.blocks.RawHTMLBlock(icon='placeholder')), ('table', wagtail.contrib.table_block.blocks.TableBlock(table_options={'renderer': 'html'}, template='includes/tableblock.html'))], blank=True),
+        ),
+        migrations.AlterField(
+            model_name='primarytopicpage',
+            name='key_info',
+            field=wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock(icon='title')), ('paragraph', wagtail.core.blocks.RichTextBlock(icon='pilcrow')), ('image', wagtail.images.blocks.ImageChooserBlock(icon='image', template='includes/imageblock.html')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='code')), ('raw_html', wagtail.core.blocks.RawHTMLBlock(icon='placeholder')), ('table', wagtail.contrib.table_block.blocks.TableBlock(table_options={'renderer': 'html'}, template='includes/tableblock.html'))], blank=True),
+        ),
+    ]

package.json

@@ -1,6 +1,6 @@
 {
     "name": "wagtail_website",
-    "version": "0.10.3",
+    "version": "0.11.0",
     "description": "IETF Wagtail site",
     "repository": "git@github.com:ietf-tools/wagtail_website.git",
     "author": "The Internet Engineering Task Force <webmaster@ietf.org>",

requirements.txt

@@ -1,10 +1,10 @@
 # link packages version lock down file
 -c constraints.txt
 
-Django>=2.2,<3
+Django>=2.2.19,<3
 djangorestframework>=3.8
-psycopg2>=2.7.5
-wagtail>=2.9,<2.10
+psycopg2-binary>=2.7.5
+wagtail>=2.11.6,<2.12
 django-libsass>=0.8
 libsass>=0.8.3
 future>=0.15.2