From f919184e14413b36b9baa12237c84c1244b0799f Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Mon, 8 May 2023 09:15:36 -0500 Subject: [PATCH 1/4] chore: pin django-oidc-provider (#5588) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d3989d3f2..05dc0718e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ django-cors-headers>=3.11.0 django-debug-toolbar>=3.2.4 django-form-utils>=1.0.3 # Only one use, in the liaisons app. Last release was in 2015. 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 From 2b1f248e369c53572afcc114b6568770012f726e Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Mon, 8 May 2023 10:29:18 -0500 Subject: [PATCH 2/4] fix: add a link to the simplified volunteer view (#5583) --- ietf/templates/nomcom/volunteers.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ietf/templates/nomcom/volunteers.html b/ietf/templates/nomcom/volunteers.html index 5cc437c23..764a055b1 100644 --- a/ietf/templates/nomcom/volunteers.html +++ b/ietf/templates/nomcom/volunteers.html @@ -10,7 +10,10 @@ {% block nomcom_content %} {% origin %}

Volunteers for {{ nomcom.group }}

- {% if not public %}Download as csv{% endif %} + {% if not public %} + Download as csv + View simplified list of only qualified volunteers + {% endif %} {% regroup volunteers by eligible as volunteers_by_eligibility %} {% for eligibility_group in volunteers_by_eligibility %}

{{ eligibility_group.grouper|yesno:"Eligible, Not Eligible" }}

From 400a830661ce8defe879b16b27a85ad0f0f21826 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Mon, 8 May 2023 15:16:31 -0500 Subject: [PATCH 3/4] chore: add bibxml-ids dir to container build. (#5590) --- dev/deploy-to-container/settings_local.py | 4 +--- dev/diff/settings_local.py | 4 +--- dev/tests/settings_local.py | 4 +--- docker/configs/settings_local.py | 4 +--- docker/scripts/app-create-dirs.sh | 4 ++++ ietf/utils/test_utils.py | 3 ++- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dev/deploy-to-container/settings_local.py b/dev/deploy-to-container/settings_local.py index b55a35ce5..d9bf00f22 100644 --- a/dev/deploy-to-container/settings_local.py +++ b/dev/deploy-to-container/settings_local.py @@ -23,9 +23,6 @@ CELERY_BROKER_URL = '__MQCONNSTR__' 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 @@ CONFLICT_REVIEW_PATH = '/assets/ietf-ftp/conflict-reviews/' 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/' diff --git a/dev/diff/settings_local.py b/dev/diff/settings_local.py index 29e55e0b6..cd3923d50 100644 --- a/dev/diff/settings_local.py +++ b/dev/diff/settings_local.py @@ -20,9 +20,6 @@ DATABASES = { 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 @@ CONFLICT_REVIEW_PATH = '/assets/ietf-ftp/conflict-reviews/' 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/' diff --git a/dev/tests/settings_local.py b/dev/tests/settings_local.py index 01e66fe84..fdc60a849 100644 --- a/dev/tests/settings_local.py +++ b/dev/tests/settings_local.py @@ -19,9 +19,6 @@ DATABASES = { 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 @@ CONFLICT_REVIEW_PATH = '/assets/ietf-ftp/conflict-reviews/' 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/' diff --git a/docker/configs/settings_local.py b/docker/configs/settings_local.py index f80e27c46..a405206c9 100644 --- a/docker/configs/settings_local.py +++ b/docker/configs/settings_local.py @@ -10,9 +10,6 @@ from ietf.settings_postgresqldb import DATABASES # pyflakes:ignore 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 @@ CONFLICT_REVIEW_PATH = '/assets/ietf-ftp/conflict-reviews/' 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/' diff --git a/docker/scripts/app-create-dirs.sh b/docker/scripts/app-create-dirs.sh index bef27923b..d9296ecff 100755 --- a/docker/scripts/app-create-dirs.sh +++ b/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 \ diff --git a/ietf/utils/test_utils.py b/ietf/utils/test_utils.py index a07f292dc..2e6c5fffb 100644 --- a/ietf/utils/test_utils.py +++ b/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 @@ class TestCase(django.test.TestCase): for dir in self._ietf_temp_dirs.values(): shutil.rmtree(dir) self.requests_mock.stop() - super().tearDown() \ No newline at end of file + super().tearDown()