This release is currently undergoing peer review and must remain unpublished until complete.
{% elif release.is_review_complete %}
- This release has undergone peer review and is currently unpublished. You can
-
publish it here
+
{% elif release.is_draft %}
The release you are viewing is currently a draft.
diff --git a/django/library/models.py b/django/library/models.py
index 9360f475a..ca82a1aea 100644
--- a/django/library/models.py
+++ b/django/library/models.py
@@ -7,17 +7,14 @@
from string import Template
import uuid
import semver
-import uuid
-from collections import OrderedDict
from datetime import timedelta
from packaging.version import Version
from abc import ABC
-from collections import OrderedDict, defaultdict
+from collections import defaultdict
from datetime import date, timedelta
from django.conf import settings
from django.contrib.postgres.fields import ArrayField
-from django.core.cache import cache
from django.core.files.images import ImageFile
from django.core.files.storage import FileSystemStorage
from django.db import models, transaction
@@ -53,13 +50,13 @@
from core.queryset import get_viewable_objects_for_user
from core.utils import send_markdown_email
from core.view_helpers import get_search_queryset
-from .metadata import CodeMetaConverter, DataCiteConverter, CitationFileFormatConverter
from .fs import (
CodebaseReleaseFsApi,
StagingDirectories,
FileCategoryDirectories,
MessageLevels,
)
+from .metadata import CodeMetaConverter, DataCiteConverter, CitationFileFormatConverter
logger = logging.getLogger(__name__)
@@ -1194,14 +1191,15 @@ def most_recently_reviewed(self, number=10, published_only=True):
qs = (
self.reviewed()
.select_related("codebase", "submitter__member_profile", "review")
- .filter(review__event_set__action='RELEASE_CERTIFIED')
+ .filter(review__event_set__action="RELEASE_CERTIFIED")
)
if published_only:
qs = qs.public()
-
+
# order by the certification event date
return qs.order_by("-review__event_set__date_created").distinct()[:number]
+
@add_to_comses_permission_whitelist
class CodebaseRelease(index.Indexed, ClusterableModel):
"""
@@ -1820,6 +1818,13 @@ def add_contributor(
def publish(self):
self.validate_publishable()
self._publish()
+ if self.peer_reviewed:
+ # if this release is peer reviewed schedule a DOI minting
+ from .tasks import schedule_mint_public_doi
+
+ schedule_mint_public_doi(
+ self, dry_run=settings.DEPLOY_ENVIRONMENT.is_development
+ )
def _publish(self):
if not self.live:
@@ -3169,6 +3174,27 @@ class PeerReviewEventLog(models.Model):
class DataCiteRegistrationLogQuerySet(models.QuerySet):
+ def mock(self, codebase_or_release, **kwargs):
+ """
+ Returns a mock DataCiteRegistrationLog entry for testing
+ """
+ return DataCiteRegistrationLog(
+ codebase=(
+ codebase_or_release
+ if isinstance(codebase_or_release, Codebase)
+ else None
+ ),
+ release=(
+ codebase_or_release
+ if isinstance(codebase_or_release, CodebaseRelease)
+ else None
+ ),
+ doi="10.1234/XYZZY.DRY.RUN",
+ metadata_hash="dry-run-metadata-hash",
+ http_status=200,
+ message="Mock log entry for testing",
+ )
+
def latest_entry(self, codebase_or_release, **kwargs):
"""
Returns the latest "successful" (200 status code from DataCite)
diff --git a/django/library/tasks.py b/django/library/tasks.py
index 239d79460..a055e7097 100644
--- a/django/library/tasks.py
+++ b/django/library/tasks.py
@@ -1,6 +1,7 @@
-from huey.contrib.djhuey import db_task
+from huey.contrib.djhuey import db_task, on_commit_task
-from .models import Codebase, CodebaseRelease
+from .doi import DataCiteApi
+from .models import CodebaseRelease
import logging
@@ -10,6 +11,21 @@
@db_task(retries=1, retry_delay=30)
def update_fs_release_metadata(release_id: int):
release = CodebaseRelease.objects.get(id=release_id)
- codebase = release.codebase
fs_api = release.get_fs_api()
fs_api.rebuild(metadata_only=True)
+
+
+@on_commit_task()
+def schedule_mint_public_doi(release: CodebaseRelease, dry_run: bool = False):
+ """
+ Mint a DOI for the given release.
+
+ Args:
+ release (CodebaseRelease): The release for which to mint a DOI.
+ dry_run (bool, optional): Flag indicating whether the operation should be performed in dry run mode.
+ Defaults to False.
+
+ Returns:
+ A tuple of DataCiteRegistrationLog or None and a boolean indicating whether the operation was successful
+ """
+ return DataCiteApi(dry_run=dry_run).mint_public_doi(release)
diff --git a/django/library/urls.py b/django/library/urls.py
index 06379e7f5..ef3524210 100644
--- a/django/library/urls.py
+++ b/django/library/urls.py
@@ -38,7 +38,7 @@
basename="codebaserelease-share",
)
-if settings.DEPLOY_ENVIRONMENT == Environment.DEVELOPMENT:
+if settings.DEPLOY_ENVIRONMENT.is_development:
router.register(
r"test_codebases",
views.DevelopmentCodebaseDeleteView,
diff --git a/django/manage.py b/django/manage.py
index 4ae463618..33e31407d 100755
--- a/django/manage.py
+++ b/django/manage.py
@@ -7,4 +7,5 @@
from django.core.management import execute_from_command_line
+ print("executing with: ", os.environ.get("DJANGO_SETTINGS_MODULE"))
execute_from_command_line(sys.argv)
diff --git a/django/requirements-test.txt b/django/requirements-test.txt
new file mode 100644
index 000000000..ffab80caa
--- /dev/null
+++ b/django/requirements-test.txt
@@ -0,0 +1,8 @@
+-r requirements.txt
+# test requirements
+coverage
+coveralls
+# https://hypothesis.readthedocs.io/en/latest/django.html
+hypothesis[django]
+sphinx
+sphinx_rtd_theme
diff --git a/django/requirements.txt b/django/requirements.txt
index 315e5879c..1d61eefcc 100644
--- a/django/requirements.txt
+++ b/django/requirements.txt
@@ -20,7 +20,7 @@ django-rest-swagger==2.2.0
django-reversion==5.1.0
django-robots==6.1
django-timezone-field==7.0.0
-django-vite==3.0.5 # latest is 3.0.5
+django-vite==3.0.5
django-waffle==4.2.0
djangorestframework==3.15.2
djangorestframework-camel-case==1.4.2
@@ -28,7 +28,7 @@ Django==4.2.22
elasticsearch-dsl>=7.0.0,<8.0.0
elasticsearch>=7.0.0,<8.0.0
html2text>=2016.9.19
-huey==2.5.1
+huey==2.5.3
jinja2==3.1.6
jsonschema==4.23.0
markdown==3.7
@@ -56,5 +56,5 @@ wagtail-modeladmin==2.1.0
invoke
ipython
pgcli
-# replace with pypi install eventually (and transfer to OMF?)
+# replace with pypi scicodes install eventually
git+https://github.com/comses/codemeticulous.git
diff --git a/e2e.yml b/e2e.yml
index df77242fb..e5560cdd1 100644
--- a/e2e.yml
+++ b/e2e.yml
@@ -4,6 +4,9 @@ services:
command: tail -f /dev/null
healthcheck:
disable: true
+ elasticsearch:
+ environment:
+ - discovery.type=single-node
e2edb:
image: postgis/postgis:16-3.5
secrets:
@@ -21,9 +24,16 @@ services:
POSTGRES_PASSWORD_FILE: /run/secrets/db_password
vite:
command: ["npm", "run", "build"]
+ ports:
+ - "127.0.0.1:5173:5173"
environment:
NODE_ENV: "e2e"
+ volumes:
+ - ./frontend:/code
server:
+ build:
+ args:
+ RUN_SCRIPT: ./deploy/dev.sh
depends_on:
db:
condition: service_started
@@ -40,5 +50,7 @@ services:
interval: 30s
timeout: 10s
retries: 5
+ ports:
+ - "127.0.0.1:8000:8000"
environment:
DJANGO_SETTINGS_MODULE: "core.settings.e2e"
diff --git a/test.yml b/test.yml
new file mode 100644
index 000000000..71f8fe892
--- /dev/null
+++ b/test.yml
@@ -0,0 +1,15 @@
+services:
+ server:
+ build:
+ args:
+ UBUNTU_MIRROR: "${UBUNTU_MIRROR}"
+ REQUIREMENTS_FILE: "requirements-test.txt"
+ RUN_SCRIPT: "./deploy/test.sh"
+ image: comses/server:dev
+ volumes:
+ - ./django:/code
+ - ./docs:/docs
+ environment:
+ DJANGO_SETTINGS_MODULE: "core.settings.test"
+ ports:
+ - "127.0.0.1:8000:8000"