Merge 6eb7fcd into 806ee62

Dockerfile

@@ -13,7 +13,7 @@ RUN apt-get update && apt-get -y upgrade
 RUN apt-get install -y gfortran
 
 # upgrade pip and install poetry
-RUN pip install --upgrade pip && pip install poetry
+RUN pip install --upgrade pip && pip install "poetry>=1.4.2"
 
 WORKDIR /src
 

observation_portal/proposals/migrations/0009_alter_semester_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.0.4 on 2023-04-12 17:03
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('proposals', '0008_auto_20210708_1623'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='semester',
+            options={'ordering': ['-start', 'id']},
+        ),
+    ]

observation_portal/proposals/models.py

@@ -65,6 +65,9 @@ class Semester(models.Model):
     end = models.DateTimeField()
     proposals = models.ManyToManyField("Proposal", through="TimeAllocation")
 
+    class Meta:
+        ordering = ["-start", "id"]
+
     @classmethod
     def current_semesters(cls, future=False):
         semesters = cls.objects.filter(end__gte=timezone.now())