Merge remote-tracking branch 'origin/main' into django4

Author: jennifer-richards

dev/deploy-to-container/settings_local.py

@@ -23,9 +23,6 @@
 IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits"
 IDSUBMIT_REPOSITORY_PATH = "/test/id/"
 IDSUBMIT_STAGING_PATH = "/test/staging/"
-INTERNET_DRAFT_ARCHIVE_DIR = "/test/archive/"
-INTERNET_ALL_DRAFTS_ARCHIVE_DIR = "/test/archive/"
-RFC_PATH = "/test/rfc/"
 
 AGENDA_PATH = '/assets/www6s/proceedings/'
 MEETINGHOST_LOGO_PATH = AGENDA_PATH
@@ -65,6 +62,7 @@
 STATUS_CHANGE_PATH = '/assets/ietf-ftp/status-changes/'
 INTERNET_DRAFT_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/'
 INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/'
+BIBXML_BASE_PATH = '/assets/ietfdata/derived/bibxml'
 
 NOMCOM_PUBLIC_KEYS_DIR = 'data/nomcom_keys/public_keys/'
 SLIDE_STAGING_PATH = '/test/staging/'

dev/diff/settings_local.py

@@ -20,9 +20,6 @@
 IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits"
 IDSUBMIT_REPOSITORY_PATH = "test/id/"
 IDSUBMIT_STAGING_PATH = "test/staging/"
-INTERNET_DRAFT_ARCHIVE_DIR = "test/archive/"
-INTERNET_ALL_DRAFTS_ARCHIVE_DIR = "test/archive/"
-RFC_PATH = "test/rfc/"
 
 AGENDA_PATH = '/assets/www6s/proceedings/'
 MEETINGHOST_LOGO_PATH = AGENDA_PATH
@@ -62,6 +59,7 @@
 STATUS_CHANGE_PATH = '/assets/ietf-ftp/status-changes/'
 INTERNET_DRAFT_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/'
 INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/'
+BIBXML_BASE_PATH = '/assets/ietfdata/derived/bibxml'
 
 NOMCOM_PUBLIC_KEYS_DIR = 'data/nomcom_keys/public_keys/'
 SLIDE_STAGING_PATH = 'test/staging/'

dev/tests/settings_local.py

@@ -19,9 +19,6 @@
 IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits"
 IDSUBMIT_REPOSITORY_PATH = "test/id/"
 IDSUBMIT_STAGING_PATH = "test/staging/"
-INTERNET_DRAFT_ARCHIVE_DIR = "test/archive/"
-INTERNET_ALL_DRAFTS_ARCHIVE_DIR = "test/archive/"
-RFC_PATH = "test/rfc/"
 
 AGENDA_PATH = '/assets/www6s/proceedings/'
 MEETINGHOST_LOGO_PATH = AGENDA_PATH
@@ -61,6 +58,7 @@
 STATUS_CHANGE_PATH = '/assets/ietf-ftp/status-changes/'
 INTERNET_DRAFT_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/'
 INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/'
+BIBXML_BASE_PATH = '/assets/ietfdata/derived/bibxml'
 
 NOMCOM_PUBLIC_KEYS_DIR = 'data/nomcom_keys/public_keys/'
 SLIDE_STAGING_PATH = 'test/staging/'

docker/configs/settings_local.py

@@ -10,9 +10,6 @@
 IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits"
 IDSUBMIT_REPOSITORY_PATH = "test/id/"
 IDSUBMIT_STAGING_PATH = "test/staging/"
-INTERNET_DRAFT_ARCHIVE_DIR = "test/archive/"
-INTERNET_ALL_DRAFTS_ARCHIVE_DIR = "test/archive/"
-RFC_PATH = "test/rfc/"
 
 AGENDA_PATH = '/assets/www6s/proceedings/'
 MEETINGHOST_LOGO_PATH = AGENDA_PATH
@@ -52,6 +49,7 @@
 STATUS_CHANGE_PATH = '/assets/ietf-ftp/status-changes/'
 INTERNET_DRAFT_ARCHIVE_DIR = '/assets/archive/id'
 INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/assets/archive/id'
+BIBXML_BASE_PATH = '/assets/ietfdata/derived/bibxml'
 
 NOMCOM_PUBLIC_KEYS_DIR = 'data/nomcom_keys/public_keys/'
 SLIDE_STAGING_PATH = 'test/staging/'

docker/scripts/app-create-dirs.sh

@@ -21,6 +21,10 @@ for sub in \
     /assets/ietf-ftp/yang/ianamod \
     /assets/ietf-ftp/yang/invalmod \
     /assets/ietf-ftp/yang/rfcmod \
+    /assets/ietfdata \
+    /assets/ietfdata/derived \
+    /assets/ietfdata/derived/bibxml \
+    /assets/ietfdata/derived/bibxml/bibxml-ids \
     /assets/www6s \
     /assets/www6s/staging \
     /assets/www6s/wg-descriptions \

ietf/templates/nomcom/volunteers.html

@@ -10,7 +10,10 @@
 {% block nomcom_content %}
     {% origin %}
     <h2>Volunteers for {{ nomcom.group }}</h2>
-    {% if not public %}<a href="{% url 'ietf.nomcom.views.private_volunteers_csv' year=year %}">Download as csv</a>{% endif %}
+    {% if not public %}
+        <a class="btn btn-primary" role="button" href="{% url 'ietf.nomcom.views.private_volunteers_csv' year=year %}">Download as csv</a>
+        <a class="btn btn-primary" role="button" href="{% url 'ietf.nomcom.views.qualified_volunteer_list_for_announcement' year=year %}">View simplified list of only qualified volunteers</a>
+    {% endif %}
     {% regroup volunteers by eligible as volunteers_by_eligibility %}
     {% for eligibility_group in volunteers_by_eligibility %}
         <h3 class="mt-3">{{ eligibility_group.grouper|yesno:"Eligible, Not Eligible" }}</h3>

ietf/utils/test_utils.py

@@ -210,6 +210,7 @@ class TestCase(django.test.TestCase):
         'INTERNET_ALL_DRAFTS_ARCHIVE_DIR',
         'INTERNET_DRAFT_ARCHIVE_DIR',
         'INTERNET_DRAFT_PATH',
+        'BIBXML_BASE_PATH',
     ]
 
     parser = html5lib.HTMLParser(strict=True)
@@ -314,4 +315,4 @@ def tearDown(self):
         for dir in self._ietf_temp_dirs.values():
             shutil.rmtree(dir)
         self.requests_mock.stop()
-        super().tearDown()
+        super().tearDown()

requirements.txt

@@ -17,7 +17,7 @@ django-csp>=3.7
 django-cors-headers>=3.11.0
 django-debug-toolbar>=3.2.4
 django-markup>=1.5    # Limited use - need to reconcile against direct use of markdown
-django-oidc-provider>=0.7
+django-oidc-provider>=0.7,<0.8    # 0.8 dropped Django 2 support
 django-password-strength>=1.2.1
 django-referrer-policy>=1.0
 django-simple-history>=3.0.0