Update Python Dependencies (#404)

* [requires.io] dependency update

* Server starts...

Various things are broken, but it runs!

* [requires.io] dependency update

* [requires.io] dependency update

* [requires.io] dependency update

* FIX: Broken migrations

* FIX: Update auth framework

* FIX: Correct static use in templates

* FIX: Fix supplier sort

* FIX: Remaining tests

* Revert "Disable password reset as temporary fix to vulnerability (#396)"

This reverts commit e0c6a56263.

# Conflicts:
#	RIGS/urls.py

* FIX: Fix broken newlining in PDFs

Introduced by a change in Django 2.1 'HTML rendered by form widgets no longer includes a closing slash on void elements, e.g. <br>. This is incompatible within XHTML, although some widgets already used aspects of HTML5 such as boolean attributes.'

* FIX: Fix some Django4 deprecation warnings

Why not...

* Refactor dependency file

Should now only include dependencies we actually use, not dependencies of dependencies and unused things

* Add newlines to the paperwork print test event

This will catch the error encountered in 79ec9214f9

* Swap to pycodestyle rather than pep8 in Travis

And eliminate W605 errors

* Bit too heavy handed with the dep purge there...

* Whoops, helps if one installs pycodestyle...

* FIX: Re-add overridden login view

* Better fix for previous commit

* FIX: Bloody smartquotes

Co-authored-by: requires.io <support@requires.io>

assets/migrations/0006_auto_20180728_1451_squashed_0021_auto_20190105_1156.py

@@ -57,7 +57,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='asset',
             name='parent',
-            field=models.ForeignKey(blank=True, null=True, on_delete=None, related_name='asset_parent', to='assets.Asset'),
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='asset_parent', to='assets.Asset'),
         ),
         migrations.RemoveField(
             model_name='asset',
@@ -85,7 +85,7 @@ class Migration(migrations.Migration):
                 ('circuits', models.IntegerField(blank=True, null=True)),
                 ('cores', models.IntegerField(blank=True, null=True)),
                 ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assets.AssetCategory')),
-                ('parent', models.ForeignKey(blank=True, null=True, on_delete=None, related_name='asset_parent', to='assets.Cable')),
+                ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='asset_parent', to='assets.Cable')),
             ],
             options={
                 'abstract': False,

assets/migrations/0010_auto_20200207_1737.py

@@ -1,17 +0,0 @@
-# Generated by Django 2.0.13 on 2020-02-07 17:37
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0009_auto_20200103_2215'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='supplier',
-            options={'ordering': ['name'], 'permissions': (('view_supplier', 'Can view a supplier'),)},
-        ),
-    ]

assets/migrations/0010_auto_20200219_1444.py

@@ -0,0 +1,21 @@
+# Generated by Django 3.0.3 on 2020-02-19 14:44
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0009_auto_20200103_2215'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='asset',
+            options={'ordering': ['asset_id_prefix', 'asset_id_number'], 'permissions': [('asset_finance', 'Can see financial data for assets')]},
+        ),
+        migrations.AlterModelOptions(
+            name='supplier',
+            options={'ordering': ['name']},
+        ),
+    ]

assets/models.py

@@ -41,13 +41,10 @@ class AssetStatus(models.Model):
 
 @reversion.register
 class Supplier(models.Model, RevisionMixin):
-    name = models.CharField(max_length=80)
-
     class Meta:
         ordering = ['name']
-        permissions = (
-            ('view_supplier', 'Can view a supplier'),
-        )
+
+    name = models.CharField(max_length=80)
 
     def get_absolute_url(self):
         return reverse('supplier_list')
@@ -70,10 +67,9 @@ class Connector(models.Model):
 class Asset(models.Model, RevisionMixin):
     class Meta:
         ordering = ['asset_id_prefix', 'asset_id_number']
-        permissions = (
-            ('asset_finance', 'Can see financial data for assets'),
-            ('view_asset', 'Can view an asset')
-        )
+        permissions = [
+            ('asset_finance', 'Can see financial data for assets')
+        ]
 
     parent = models.ForeignKey(to='self', related_name='asset_parent',
                                blank=True, null=True, on_delete=models.SET_NULL)

assets/templates/asset_embed.html

@@ -1,8 +1,7 @@
 {% extends 'base_embed.html' %}
-{% load static from staticfiles %}
+{% load static %}
 
 {% block content %}
-
 <div class="row">
     <div class="col-sm-12">
         <a href="/assets">
@@ -35,6 +34,4 @@
         </table>
     </div>
 </div>
-
-
 {% endblock %}

assets/tests/test_assets.py

@@ -249,7 +249,7 @@ class TestSupplierCreateAndEdit(AutoLoginTest):
     def test_supplier_edit(self):
         self.page = pages.SupplierEdit(self.driver, self.live_server_url, supplier_id=self.supplier.pk).open()
 
-        self.assertEquals("Fullmetal Heavy Industry", self.page.name)
+        self.assertEqual("Fullmetal Heavy Industry", self.page.name)
         new_name = "Cyberdyne Systems"
         self.page.name = new_name
         self.page.submit()