Merge branch 'ep2021' into ep2021

Author: fpierfed

assopy/migrations/0016_null_has_no_effect_on_vat_manytomay_relationship.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.19 on 2021-05-17 07:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assopy', '0015_remove_refund_models'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='vat',
+            name='fares',
+            field=models.ManyToManyField(blank=True, through='assopy.VatFare', to='conference.Fare'),
+        ),
+    ]

assopy/models.py

@@ -511,7 +511,7 @@ def create(self, user, payment, items, billing_notes='', coupons=None, country=N
 class Vat(models.Model):
     fares = models.ManyToManyField(Fare,
                                    through='VatFare',
-                                   null=True, blank=True)
+                                   blank=True)
     value = models.DecimalField(max_digits=5, decimal_places=2)
     description = models.CharField(null=True, blank=True, max_length=125)
     invoice_notice = models.TextField(null=True, blank=True)

pycon/settings.py

@@ -730,11 +730,11 @@ def CONFERENCE_SCHEDULE_ATTENDEES(schedule, forecast):
 # Matrix Auth API settings
 MATRIX_AUTH_API_DEBUG = config(
     'MATRIX_AUTH_API_DEBUG',
-    default=False,
+    default=True,
     cast=bool
 )
 MATRIX_AUTH_API_ALLOWED_IPS = config(
     'MATRIX_AUTH_API_ALLOWED_IPS',
     default='',
-    cast=lambda v: [s.strip() for s in v.split(',')]
+    cast=lambda v: [s.strip() for s in v.split(',') if s.strip()]
 )

requirements.txt

@@ -95,7 +95,7 @@ django-treebeard==4.4
     # via
     #   -r requirements.in
     #   django-cms
-django==2.2.19
+django==2.2.23
     # via
     #   -r requirements.in
     #   cmsplugin-filer