Merge pull request #778 from alee/npm-update

deps: npm update

base.yml

@@ -33,7 +33,7 @@ services:
       - ./deploy/elasticsearch.conf.d/log4j2.properties:/usr/share/elasticsearch/config/log4j2.properties
       - esdata:/usr/share/elasticsearch/data
   db:
-    image: postgis/postgis:16-3.4
+    image: postgis/postgis:16-3.5
     secrets:
       - db_password
     volumes:

django/curator/invoke_tasks/__init__.py

@@ -1,6 +1,6 @@
 from invoke import Collection
 
-from . import borg, database, docs, elasticsearch, drupal, permissions
+from . import borg, database, docs, es, drupal, permissions
 from .base import (
     clean,
     collectstatic,
@@ -29,6 +29,6 @@
 ns.add_collection(borg)
 ns.add_collection(Collection.from_module(database, "db"))
 ns.add_collection(docs)
-ns.add_collection(Collection.from_module(elasticsearch, "es"))
+ns.add_collection(Collection.from_module(es, "es"))
 ns.add_collection(drupal)
 ns.add_collection(Collection.from_module(permissions, "perm"))

django/curator/invoke_tasks/elasticsearch.py → django/curator/invoke_tasks/es.py

@@ -4,6 +4,9 @@
 
 @task(aliases=["ul"])
 def update_license(ctx, license_path=None):
+    """
+    FIXME: check if this is still used / needed
+    """
     es_hosts = ["elasticsearch"]
     if settings.DEPLOY_ENVIRONMENT.is_production:
         es_hosts.append("elasticsearch2")

django/library/jinja2/library/codebases/releases/retrieve.jinja

@@ -344,10 +344,10 @@
                         <i class='fas fa-question-circle'></i> How do I get assigned a DOI?
                     </a>
                     <div class="collapse bg-light rounded p-2 text-muted small" id="doi-info-collapse">
-                        We assign DOIs to <a href='{{ url("library:peer-review-overview") }}'>peer reviewed models</a>. If you would like a DOI and your
-                        model has not been reviewed yet, please request a peer review by clicking the "Request peer review"
-                        button below. If your model has already been reviewed and has not yet been assigned a DOI, please 
-                        <a href='{{slugurl('contact')}}'>contact us</a>.
+                        We assign DOIs to <b>published, <a href='{{ url("library:peer-review-overview") }}'>peer reviewed models</a></b>. 
+                        To receive a DOI first use the "Request peer review" button below. After successfully passing
+                        peer review, publish your model when ready and a DOI will be issued for this release version
+                        within 24 hours.
                     </div>
                 {% endif %}
             {% endif %}

django/library/jinja2/library/review/email/model_certified.jinja

@@ -4,9 +4,9 @@
 
 Dear {{ review.submitter.name }},
 
-Congratulations! The peer review of your model [{{ release.title }}]({{ release_url }}) is now complete and your release has been marked as peer reviewed. Your release will remain private until you [publish it yourself]({{release_publish_url}}). An automatic DOI registration workflow that automatically assigns a DOI to all peer reviewed models is slated for development by Q2 2024. If you need a DOI immediately please feel free to [contact us]({{ build_absolute_uri(slugurl('contact')) }}).
+Congratulations! The peer review of your model [{{ release.title }}]({{ release_url }}) is now complete and your release has been marked as peer reviewed. Your release will remain private until you [publish it yourself]({{release_publish_url}}). DOIs are automatically minted for peer reviewed, published models but may take up to a day to be fully registered. If your model still has not been issued a DOI after being published after 24 hours or you encounter any issues please feel free to [contact us]({{ build_absolute_uri(slugurl('contact')) }}).
 
-Thank you for submitting your computational model for review to CoMSES Net! We hope you will be willing to serve as a reviewer of model code as well in future model peer reviews.
+Thank you for submitting your computational model for review to CoMSES Net! Please consider serving as a reviewer of model code in future model peer reviews.
 
 Best regards,
 The CoMSES Net Editors