Merged in Django 2.2 changes.

 - Legacy-Id: 18090

Author: levkowetz

changelog

@@ -1,3 +1,42 @@
+ietfdb (7.6.0) ietf; urgency=medium
+
+  Django 2.2 transition changes:
+
+  * New branch for 7.5.1.dev0
+
+  * Changed deprecated 'load staticfiles' to recommended 'load static'
+
+  * Added a warnings filter.  Removed the use request_profiler, which is 
+    not compatible with Django 2.2.
+
+  * Removed an unused parameter from submit.tests.do_submission_email().
+
+  * Updated requirements for Django 2.2.
+
+  * Fixed an issue where a session was saved without a type_id, found by 
+    the Django 2.2 checks.  The code set the value just after the first save, 
+    and then did a second save, but this is 1) more costly, and 2) keeps an 
+    invalid session object in the database for a short time.
+
+  * Fixed a place where data provider for a POST in contained None, which 
+    cannot be serialized into POST data.  Found by Django 2.2 checks.
+
+  * Django 2.2 does not wrap single queries in transactions, for 
+    performance reasons.  This caused some template tags that did database 
+    lookups to trigger exceptions.  Fixed by moving the lookups (which would 
+    not normally change between apache reloads) out from the template tag code 
+    to module scope.  Adding new groups of type 
+    ['ag','area','team','dir','program'] will now require a reload to show up 
+    in the group menu.
+
+  Other changes:
+
+  * Changed skip messages from test suites to use print() instead of
+    sys.stderr.write(), to match other output from the test runner.
+
+ -- Henrik Levkowetz <henrik@levkowetz.com>  27 Jun 2020 17:33:10 +0000
+
+
 ietfdb (7.5.0) ietf; urgency=medium
 
   **Django 2.1 upgrade, CodiMD support, bluesheet support for Meetecho, and bugfixes**

ietf/doc/templatetags/active_groups_menu.py

@@ -5,9 +5,11 @@
 
 register = template.Library()
 
+parents = GroupTypeName.objects.filter(slug__in=['ag','area','team','dir','program'])
+
 @register.simple_tag
 def active_groups_menu():
-    parents = GroupTypeName.objects.filter(slug__in=['ag','area','team','dir','program'])
+    global parents
     for p in parents:
         p.menu_url = '/%s/'%p.slug
     return render_to_string('base/menu_active_groups.html', { 'parents': parents })

ietf/doc/templatetags/wg_menu.py

@@ -43,10 +43,14 @@
     'rai':'RAI'
     }
 
+parents = Group.objects.filter(
+                models.Q(type="area") | models.Q(type="irtf", acronym="irtf"),
+                state="active"
+            ).order_by('type_id', 'acronym')
+
 @register.simple_tag
 def wg_menu():
-    parents = Group.objects.filter(models.Q(type="area") | models.Q(type="irtf", acronym="irtf"),
-                                   state="active").order_by('type_id', 'acronym')
+    global parents
 
     for p in parents:
         p.short_name = area_short_names.get(p.acronym) or p.name

ietf/meeting/forms.py

@@ -250,9 +250,11 @@ def clean_requested_duration(self):
     def save(self, *args, **kwargs):
         """NOTE: as the baseform of an inlineformset self.save(commit=True)
         never gets called"""
-        session = super(InterimSessionModelForm, self).save(commit=kwargs.get('commit', True))
+        session = super(InterimSessionModelForm, self).save(commit=False)
         session.group = self.group
         session.type_id = 'regular'
+        if kwargs.get('commit', True) is True:
+            super(InterimSessionModelForm, self).save(commit=True)
         return session
 
     def save_agenda(self):

ietf/secr/rolodex/tests.py

@@ -61,7 +61,7 @@ def test_edit_replace_user(self):
         post_data = {
             'name': person.name,
             'ascii': person.ascii,
-            'ascii_short': person.ascii_short,
+            'ascii_short': person.ascii_short or '',
             'user': user.username,
             'email-0-person':person.pk,
             'email-0-address': email.address,

ietf/settings.py

@@ -16,7 +16,7 @@
 warnings.filterwarnings("ignore", message="Add the `renderer` argument to the render\(\) method of", module="bootstrap3")
 warnings.filterwarnings("ignore", message="The logout\(\) view is superseded by")
 warnings.filterwarnings("ignore", message="Report.file_reporters will no longer be available in Coverage.py 4.2", module="coverage.report")
-
+warnings.filterwarnings("ignore", message="{% load staticfiles %} is deprecated")
 
 try:
     import syslog
@@ -378,9 +378,6 @@ def skip_unreadable_post(record):
 
 
 MIDDLEWARE = [
-    # Must be first to measure correct request timing
-    'request_profiler.middleware.ProfilingMiddleware',
-    #
     'django.middleware.csrf.CsrfViewMiddleware',
     'corsheaders.middleware.CorsMiddleware', # see docs on CORS_REPLACE_HTTPS_REFERER before using it
     'django.middleware.common.CommonMiddleware',
@@ -429,7 +426,6 @@ def skip_unreadable_post(record):
     'djangobwr',
     'form_utils',
     'oidc_provider',
-    'request_profiler',
     'simple_history',
     'tastypie',
     'widget_tweaks',
@@ -1107,7 +1103,6 @@ def skip_unreadable_post(record):
 
 CHECKS_LIBRARY_PATCHES_TO_APPLY = [
     'patch/fix-unidecode-argument-warning.patch',
-    'patch/fix-request-profiler-streaming-length.patch',
     'patch/change-oidc-provider-field-sizes-228.patch',
     'patch/fix-oidc-access-token-post.patch',
     'patch/fix-jwkest-jwt-logging.patch',

ietf/submit/tests.py

@@ -1673,7 +1673,6 @@ def do_submission_email(self, the_url, to, body):
         q = PyQuery(r.content)
         post_button = q('[type=submit]:contains("Send Email")')
         self.assertEqual(len(post_button), 1)
-        action = post_button.parents("form").find('input[type=hidden][name="action"]').val()
         subject = post_button.parents("form").find('input[name="subject"]').val()
         frm = post_button.parents("form").find('input[name="frm"]').val()
         cc = post_button.parents("form").find('input[name="cc"]').val()
@@ -1683,7 +1682,6 @@ def do_submission_email(self, the_url, to, body):
 
         # post submitter info
         r = self.client.post(the_url, {
-            "action": action,
             "subject": subject,
             "frm": frm,
             "to": to,

ietf/templates/401.html

@@ -1,6 +1,6 @@
 {# Copyright The IETF Trust 2012, All Rights Reserved #}
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}401 Unauthorized{% endblock %}
 {% block content %}
 

ietf/templates/404.html

@@ -1,6 +1,6 @@
 {# Copyright The IETF Trust 2007, All Rights Reserved #}
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}404 Not Found{% endblock %}
 {% block content %}
 

ietf/templates/500.html

@@ -1,6 +1,6 @@
 {# Copyright The IETF Trust 2007, All Rights Reserved #}
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}500 Internal Server Error{% endblock %}
 {% block content %}