Merge dependabot/pip/django-test-migrations-1.4.0 into combined-prs-b…

…ranch

.github/dependabot.yml

@@ -4,8 +4,7 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "weekly"
-      day: "sunday"
+      interval: "daily"
 
   # Enable version updates for Python/Pip - Production
   - package-ecosystem: "pip"
@@ -14,8 +13,7 @@ updates:
     directory: "/"
     # Check for updates to GitHub Actions every weekday
     schedule:
-      interval: "weekly"
-      day: "sunday"
+      interval: "daily"
     allow:
       # Allow only direct dependencies - should be ok with pip-sync?
       - dependency-type: "direct"

gregor_django/gregor_anvil/adapters.py

@@ -119,8 +119,8 @@ class ReleaseWorkspaceAdapter(BaseWorkspaceAdapter):
     """Adapter for ReleaseWorkspace."""
 
     type = "release"
-    name = "Release workspace"
-    description = "Workspaces for release to the general scientific community via dbGaP"
+    name = "Release prep workspace"
+    description = "Workspaces for preparing releases for the general scientific community via dbGaP"
     list_table_class_view = tables.ReleaseWorkspaceTable
     list_table_class_staff_view = tables.ReleaseWorkspaceTable
     workspace_data_model = models.ReleaseWorkspace

gregor_django/gregor_anvil/migrations/0025_releaseworkspace_meta_change_verbose_name.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.14 on 2024-08-01 18:14
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gregor_anvil', '0024_member_upload_groups'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='historicalreleaseworkspace',
+            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical release prep workspace', 'verbose_name_plural': 'historical release prep workspaces'},
+        ),
+        migrations.AlterModelOptions(
+            name='releaseworkspace',
+            options={'verbose_name': 'release prep workspace'},
+        ),
+    ]

gregor_django/gregor_anvil/models.py

@@ -249,7 +249,7 @@ class CombinedConsortiumDataWorkspace(TimeStampedModel, BaseWorkspaceData):
 
 
 class ReleaseWorkspace(TimeStampedModel, BaseWorkspaceData):
-    """A model to track a workspace for release to the scientific community."""
+    """A model to track a workspace for preparing data releases for the scientific community."""
 
     phs = 3047
     """dbGaP-assigned phs for the GREGoR study."""
@@ -285,6 +285,7 @@ class Meta:
                 fields=["consent_group", "upload_cycle"],
             ),
         ]
+        verbose_name = "release prep workspace"
 
     def get_dbgap_accession(self):
         return "phs{phs:06d}.v{v}.p{p}".format(phs=self.phs, v=self.dbgap_version, p=self.dbgap_participant_set)

gregor_django/templates/gregor_anvil/uploadcycle_detail.html

@@ -30,7 +30,7 @@ <h2>Combined consortium data workspaces</h2>
   {% render_table tables.1 %}
 </div>
 
-<h2>Release workspaces</h2>
+<h2>Release prep workspaces</h2>
 <div class="container">
   {% render_table tables.2 %}
 </div>

requirements/test-requirements.txt

@@ -19,7 +19,7 @@ coverage[toml]==7.5.2
     #   pytest-cov
 django-coverage-plugin==3.1.0
     # via -r requirements/test-requirements.in
-django-test-migrations==1.3.0
+django-test-migrations==1.4.0
     # via -r requirements/test-requirements.in
 exceptiongroup==1.2.0
     # via pytest