Merge branches 'bug/2485', 'fix-docker' and 'bug/2488', remote-tracki…

…ng branch 'origin/bug/2489' into develop

.github/workflows/django.yml

@@ -84,7 +84,7 @@ jobs:
         with:
           fetch-depth: 1
       - name: Build Docker image (dev)
-        run: docker-compose -f docker-compose.yml build
+        run: docker compose -f docker-compose.yml build
 
   build-docker-prod:
 
@@ -95,4 +95,4 @@ jobs:
         with:
           fetch-depth: 1
       - name: Build Docker image (prod)
-        run: docker-compose -f docker-compose.yml -f docker-compose.prod.yml build
+        run: docker compose -f docker-compose.yml -f docker-compose.prod.yml build

deploy_heroku.py

@@ -158,7 +158,7 @@ def get_git_push_spec():
     exit(1)
 
 # Create the app with addons
-addons = ["papertrail", "heroku-postgresql:%s" % args.pg_plan, "rediscloud:30"]
+addons = ["papertrail", "heroku-postgresql:%s" % args.pg_plan, "rediscloud:30", "heroku-redis:mini"]
 command = ["heroku", "apps:create", "--stack", "heroku-22"]
 
 if addons:
@@ -170,10 +170,6 @@ def get_git_push_spec():
 urlname = match.group(1)
 heroku_url = match.group(2)
 
-# Add the redis add-ons (the heroku one needs a config flag)
-run_heroku_command(["addons:create", "heroku-redis:mini",
-                    "--maxmemory_policy", "allkeys-lru", "--timeout", "1800"])
-
 # Set build packs
 run_heroku_command(["buildpacks:set", "https://github.com/heroku/heroku-buildpack-nginx.git"])
 run_heroku_command(["buildpacks:add", "heroku/nodejs"])

tabbycat/api/views.py

@@ -765,7 +765,7 @@ def get_queryset(self):
     def get_max_round(self):
         if self.request.query_params.get('round'):
             return Round.objects.get(tournament=self.tournament, seq=int(self.request.query_params.get('round')))
-        return None
+        return Round.objects.filter(tournament=self.tournament).order_by('seq').last()
 
     @extend_schema(tags=['standings'], parameters=[
         tournament_parameter,