Remove budget_for_hosting_challenge field

comic · Dec 19, 2024 · ec6d079 · ec6d079
1 parent 91fee2e
commit ec6d079
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git a/app/grandchallenge/challenges/admin.py b/app/grandchallenge/challenges/admin.py
@@ -88,7 +88,6 @@ class ChallengeRequestAdmin(ModelAdmin):
         "created",
         "status",
         "total_cost",
-        "budget_for_hosting_challenge",
     )
     actions = ["create_challenge", "send_status_update_email"]
     list_filter = ["status"]

diff --git a/app/grandchallenge/challenges/forms.py b/app/grandchallenge/challenges/forms.py
@@ -186,7 +186,6 @@ class Meta:
             "algorithm_outputs",
             *phase_1_items,
             *phase_2_items,
-            "budget_for_hosting_challenge",
             "challenge_fee_agreement",
             "comments",
         )
@@ -200,7 +199,6 @@ class Meta:
             "data_license": "We agree to publish the data set for this challenge under a CC-BY license.",
             "phase_1_number_of_submissions_per_team": "Expected number of submissions per team to Phase 1",
             "phase_2_number_of_submissions_per_team": "Expected number of submissions per team to Phase 2",
-            "budget_for_hosting_challenge": "Budget for hosting challenge in Euros",
             "inference_time_limit_in_minutes": "Average algorithm job run time in minutes",
             "algorithm_maximum_settable_memory_gb": "Maximum memory for algorithm jobs in GB",
             "structured_challenge_submission_doi": "DOI",
@@ -454,7 +452,6 @@ def __init__(self, creator, *args, **kwargs):
                     *phase_2_items,
                     css_class="border rounded px-4 pt-4 my-5",
                 ),
-                "budget_for_hosting_challenge",
                 "challenge_fee_agreement",
                 "comments",
             ),

diff --git a/...llenge/challenges/migrations/0046_remove_challengerequest_budget_for_hosting_challenge.py b/...llenge/challenges/migrations/0046_remove_challengerequest_budget_for_hosting_challenge.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.2.17 on 2024-12-19 11:46
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        (
+            "challenges",
+            "0045_challengerequest_algorithm_maximum_settable_memory_gb_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="challengerequest",
+            name="budget_for_hosting_challenge",
+        ),
+    ]
diff --git a/app/grandchallenge/challenges/models.py b/app/grandchallenge/challenges/models.py
@@ -950,9 +950,6 @@ class ChallengeRequestStatusChoices(models.TextChoices):
         "phase 1 and 2 cost estimates by the number of tasks.",
         validators=[MinValueValidator(limit_value=1)],
     )
-    budget_for_hosting_challenge = models.PositiveIntegerField(
-        help_text="What is your budget for hosting this challenge? Please be reminded of our <a href='/challenge-policy-and-pricing/'>challenge pricing policy</a>.",
-    )
     long_term_commitment = models.BooleanField(
         default=False,
     )

diff --git a/app/grandchallenge/challenges/templates/challenges/challengerequest_detail.html b/app/grandchallenge/challenges/templates/challenges/challengerequest_detail.html
@@ -75,7 +75,6 @@ <h3>[{{ object.short_name }}] {{ object.title  }}</h3>
         {% else %}
             <tr><td class="font-weight-bold">Public data license</td> <td><i class="fas fa-exclamation-circle text-danger pr-2"></i> The organizers do not agree to publish their public data set under a CC-BY license for the following reason: <br> <span class="ml-4">{{ object.data_license_extra }}</span></td></tr>
         {% endif %}
-        <tr><td class="font-weight-bold">Organizer's budget for hosting challenge</td> <td>{{ object.budget_for_hosting_challenge }} €</td></tr>
         {% if object.comments %}
             <tr><td class="font-weight-bold">Comments from organizers</td> <td><div class="bg-warning rounded p-3">{{ object.comments|linebreaks }}</div></td></tr>
         {% endif %}

diff --git a/app/tests/challenges_tests/test_forms.py b/app/tests/challenges_tests/test_forms.py
@@ -37,7 +37,6 @@ def test_challenge_request_budget_fields_required():
         "expected_number_of_teams": 10,
         "number_of_tasks": 1,
         "challenge_fee_agreement": True,
-        "budget_for_hosting_challenge": 0,
     }
     form = ChallengeRequestForm(data=data, creator=user)
     assert not form.is_valid()
@@ -60,7 +59,6 @@ def test_challenge_request_budget_fields_required():
         "expected_number_of_teams": 10,
         "number_of_tasks": 1,
         "challenge_fee_agreement": True,
-        "budget_for_hosting_challenge": 0,
         "algorithm_inputs": "foo",
         "algorithm_outputs": "foo",
         "average_size_of_test_image_in_mb": 1,

diff --git a/app/tests/factories.py b/app/tests/factories.py
@@ -115,7 +115,6 @@ class Meta:
     phase_1_number_of_test_images = 100
     phase_2_number_of_test_images = 0
     number_of_tasks = 1
-    budget_for_hosting_challenge = 0
     structured_challenge_submission_doi = "10.5281/zenodo.6362337"