Support for #374

EDRN · Oct 25, 2024 · f6315d5 · f6315d5
1 parent 245d7b8
commit f6315d5
Show file tree

Hide file tree

Showing 16 changed files with 36 additions and 34 deletions.
diff --git a/.github/workflows/delivery.yaml b/.github/workflows/delivery.yaml
@@ -18,6 +18,7 @@ on:
     push:
         branches:
             -   main
+            -   i374
         paths:
             -   'src/**'
             -   'docker/Dockerfile'

diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
@@ -124,7 +124,7 @@ services:
     #
     # Port 6379, not published.
     cache:
-        image: redis:7.0.11-alpine3.18
+        image: redis:7.4.1-alpine3.20
         networks:
             -   lattice
         restart: on-failure

diff --git a/src/edrn.collabgroups/setup.cfg b/src/edrn.collabgroups/setup.cfg
@@ -17,7 +17,7 @@ package_dir =
 packages = find_namespace:
 python_requires = >= 3.9
 install_requires =
-    django  < 5
+    django  < 6
     wagtail < 6
     edrnsite.streams
     edrnsite.content

diff --git a/src/edrn.metrics/setup.cfg b/src/edrn.metrics/setup.cfg
@@ -18,7 +18,7 @@ packages = find_namespace:
 python_requires = >= 3.9
 install_requires =
     edrn.auth
-    django  < 5
+    django  < 6
     wagtail < 6
 
 

diff --git a/src/edrn.theme/setup.cfg b/src/edrn.theme/setup.cfg
@@ -20,7 +20,7 @@ python_requires = >= 3.9
 install_requires =
     edrn.auth
     edrnsite.controls
-    django  <  5
+    django  <  6
     wagtail <  6
 
 

diff --git a/src/edrnsite.content/setup.cfg b/src/edrnsite.content/setup.cfg
@@ -18,7 +18,7 @@ packages = find_namespace:
 python_requires = >= 3.9
 install_requires =
     edrnsite.streams
-    django  < 5
+    django  < 6
     wagtail < 6
     django-widget-tweaks ~= 1.4.12
     wagtail-django-recaptcha ~= 1.0

diff --git a/src/edrnsite.controls/setup.cfg b/src/edrnsite.controls/setup.cfg
@@ -17,7 +17,7 @@ package_dir =
 packages = find:
 python_requires = >= 3.9
 install_requires =
-    django  < 5
+    django  < 6
     wagtail < 6
 
 

diff --git a/src/edrnsite.ploneimport/setup.cfg b/src/edrnsite.ploneimport/setup.cfg
@@ -17,7 +17,7 @@ package_dir =
 packages = find_namespace:
 python_requires = >= 3.9
 install_requires =
-    django  < 5
+    django  < 6
     wagtail < 6
 
 

diff --git a/src/edrnsite.policy/setup.cfg b/src/edrnsite.policy/setup.cfg
@@ -27,21 +27,21 @@ install_requires =
     edrnsite.ploneimport
     eke.biomarkers
     edrn.metrics
-    edrn.auth             ~= 2.0.0
-    celery[redis]         ~= 5.2.7
+    edrn.auth             ~= 2.0.1
+    celery[redis]         ~= 5.4.0
     dj-database-url       ~= 2.1.0
-    django                ~= 4.2.9
-    django-auth-ldap      ~= 4.1.0
+    django                ~= 5.0.9
+    django-auth-ldap      ~= 5.1.0
     django-celery-results ~= 2.5.1
     django-redis          ~= 5.4.0
     pillow                ~= 10.3.0        # Must match py3-pillow package installed in Dockerfile
     psycopg2              ~= 2.9.9         # Must match py3-pyscopg2 package installed in Dockerfile
     pymemcache            ~= 3.5.2
-    wagtail               == 5.2.3
+    wagtail               == 5.2.6
     wagtail-favicon       ~= 0.3.0
     wagtail-metadata      ~= 5.0.0
-    tzdata                == 2022.1        # Must match py3-tz-2022.1 package installed in Dockerfile
-    wagtailmenus          == 3.1.9
+    tzdata                == 2024.2
+    wagtailmenus          ~= 4.0.1
     wagtail-robots        @ git+https://github.com/unexceptable/wagtail-robots.git@9a47b6c09bec120bd5a85f4c7c1856cdc7f71f51
 
 

diff --git a/src/edrnsite.search/setup.cfg b/src/edrnsite.search/setup.cfg
@@ -18,7 +18,7 @@ packages = find_namespace:
 python_requires = >= 3.9
 install_requires =
     edrnsite.controls
-    django < 5
+    django < 6
     wagtail < 6
     elasticsearch == 7.13.4
 

diff --git a/src/edrnsite.streams/setup.cfg b/src/edrnsite.streams/setup.cfg
@@ -17,7 +17,7 @@ package_dir =
 packages = find_namespace:
 python_requires = >= 3.9
 install_requires =
-    django < 5
+    django < 6
     wagtail < 6
 
 

diff --git a/src/edrnsite.test/setup.cfg b/src/edrnsite.test/setup.cfg
@@ -20,7 +20,7 @@ install_requires =
     selenium ~= 4.9.1
     edrnsite.controls
     edrnsite.content
-    django  < 5
+    django  < 6
     wagtail < 6
 
 

diff --git a/src/eke.biomarkers/setup.cfg b/src/eke.biomarkers/setup.cfg
@@ -22,7 +22,7 @@ install_requires =
     edrnsite.content
     edrn.auth
     biopython          ~= 1.81    # Must mathc py3-biopython package in Dockerfile
-    django             <  5
+    django             <  6
     django_plotly_dash == 1.7.1
     numpy              ~= 1.25.2  # Must match py3-numpy package in Dockerfile
     pandas             ~= 2.0.3   # Must match py3-pandas package in Dockerfile

diff --git a/src/eke.geocoding/setup.cfg b/src/eke.geocoding/setup.cfg
@@ -19,7 +19,7 @@ packages = find_namespace:
 python_requires = >= 3.9
 install_requires =
     boto3    ~= 1.24.75
-    django   <  5
+    django   <  6
     geocoder ~= 1.38.1
     wagtail  <  6
 

diff --git a/src/eke.knowledge/setup.cfg b/src/eke.knowledge/setup.cfg
@@ -24,9 +24,9 @@ install_requires =
     eke.geocoding
     biopython                       ~= 1.81    # Must match py3-biopython package in Dockerfile
     boto3                           ~= 1.24.75
-    celery                          ~= 5.2.7
+    celery                          ~= 5.4.0
     dash-dangerously-set-inner-html ~= 0.0.2
-    django                          <  5
+    django                          <  6
     django_plotly_dash              == 1.7.1
     humanize                        ~= 4.3.0
     libgravatar                     ~= 1.0.4

diff --git a/support/P5.postman_collection.json b/support/P5.postman_collection.json
@@ -2032,27 +2032,27 @@
 																"exec": [
 																	"pm.test('Reference set types field', () => {",
 																	"    const body = pm.response.text();",
-																	"    const exp = /<select name=.ref_sets. class=.form-control. required id=.id_ref_sets. multiple>/;",
+																	"    const exp = /<select name=.ref_sets. class=.form-control. required.+id=.id_ref_sets. multiple>/;",
 																	"    pm.expect(body).to.match(exp);",
 																	"});",
 																	"pm.test('Investigator field', () => {",
 																	"    const body = pm.response.text();",
-																	"    const exp = /<input type=.text. name=.investigator.+ class=.form-control. required id=\"id_investigator\">/",
+																	"    const exp = /<input type=.text. name=.investigator.+ class=.form-control.+required.+id=\"id_investigator\">/",
 																	"    pm.expect(body).to.match(exp);",
 																	"});",
 																	"pm.test('Institution field', () => {",
 																	"    const body = pm.response.text();",
-																	"    const exp = /<input type=.text. name=.institution.+ class=.form-control. required id=\"id_institution\">/",
+																	"    const exp = /<input type=.text. name=.institution.+ class=.form-control. required.+id=\"id_institution\">/",
 																	"    pm.expect(body).to.match(exp);",
 																	"});",
 																	"pm.test('\"Your name\" field', () => {",
 																	"    const body = pm.response.text();",
-																	"    const exp = /<input type=.text. name=.name.+ class=.form-control. required id=\"id_name\">/",
+																	"    const exp = /<input type=.text. name=.name.+ class=.form-control. required.+id=\"id_name\">/",
 																	"    pm.expect(body).to.match(exp);",
 																	"});",
 																	"pm.test('Email field', () => {",
 																	"    const body = pm.response.text();",
-																	"    const exp = /<input type=.email. name=.email.+ class=.form-control. required id=\"id_email\">/",
+																	"    const exp = /<input type=.email. name=.email.+ class=.form-control. required.+id=\"id_email\">/",
 																	"    pm.expect(body).to.match(exp);",
 																	"});",
 																	"pm.test('Phone field', () => {",
@@ -2071,12 +2071,12 @@
 																	"});",
 																	"pm.test('Organ site field', () => {",
 																	"    const body = pm.response.text();",
-																	"    const exp = /<input type=.text. name=.organ_site. class=.form-control. required id=.id_organ_site.>/;",
+																	"    const exp = /<input type=.text. name=.organ_site. class=.form-control. required.+id=.id_organ_site.>/;",
 																	"    pm.expect(body).to.match(exp);",
 																	"});",
 																	"pm.test('Study length field', () => {",
 																	"    const body = pm.response.text();",
-																	"    const exp = /<input type=.number. name=.study_length. min=.0. class=.form-control. required id=.id_study_length.>/;",
+																	"    const exp = /<input type=.number. name=.study_length. min=.0. class=.form-control. required.+id=.id_study_length.>/;",
 																	"    pm.expect(body).to.match(exp);",
 																	"});",
 																	"pm.test('Specimen type checkboxes', () => {",
@@ -2090,12 +2090,12 @@
 																	"});",
 																	"pm.test('Other specimen type field', () => {",
 																	"    const body = pm.response.text();",
-																	"    const exp = /<input type=.text. name=.other_specimen_type. class=.form-control. id=.id_other_specimen_type.>/;",
+																	"    const exp = /<input type=.text. name=.other_specimen_type. class=.form-control.+id=.id_other_specimen_type.>/;",
 																	"    pm.expect(body).to.match(exp);",
 																	"});",
 																	"pm.test('Minimum volume field', () => {",
 																	"    const body = pm.response.text();",
-																	"    const exp = /<textarea name=.min_volume..+required id=.id_min_volume.>/;",
+																	"    const exp = /<textarea name=.min_volume..+required.+id=.id_min_volume.>/;",
 																	"    pm.expect(body).to.match(exp);",
 																	"});",
 																	"pm.test('IRB radio buttons', () => {",
@@ -2109,7 +2109,7 @@
 																	"});",
 																	"pm.test('IRB elaboration field', () => {",
 																	"    const body = pm.response.text();",
-																	"    const exp = /<input type=.text. name=.irb_explanation. class=.form-control. id=.id_irb_explanation.>/;",
+																	"    const exp = /<input type=.text. name=.irb_explanation. class=.form-control.+id=.id_irb_explanation.>/;",
 																	"    pm.expect(body).to.match(exp);",
 																	"});",
 																	"pm.test('NIH funding', () => {",
@@ -2137,7 +2137,7 @@
 																	"});",
 																	"pm.test('Scientific proposal upload', () => {",
 																	"    const body = pm.response.text();",
-																	"    const exp = /<input type=.file. name=.proposal. class=.form-control. required id=.id_proposal.>/;",
+																	"    const exp = /<input type=.file. name=.proposal. class=.form-control. required.+id=.id_proposal.>/;",
 																	"    pm.expect(body).to.match(exp);",
 																	"});",
 																	"pm.test('Affirmations', () => {",
@@ -2151,12 +2151,13 @@
 																	"});",
 																	"pm.test('Signature', () => {",
 																	"    const body = pm.response.text();",
-																	"    const exp = /<input type=.text. name=.signature.*required id=.id_signature.>/;",
+																	"    const exp = /<input type=.text. name=.signature.+required.+id=.id_signature.>/;",
 																	"    pm.expect(body).to.match(exp);",
 																	"});",
 																	""
 																],
-																"type": "text/javascript"
+																"type": "text/javascript",
+																"packages": {}
 															}
 														}
 													],