Merge pull request #388 from aiarena/staging

Release v1.6.7

aiarena/frontend/static/style.css

@@ -241,6 +241,14 @@ a:hover {
     text-align: left;
 }
 
+#bot_bio tr:hover a {
+    color: #86c232;
+}
+
+#bot_bio tr:hover a:hover {
+    color: #ffffff;
+}
+
 #bot_wiki_article {
     padding: 0 10px 0 10px;
 }

aiarena/frontend/views.py

@@ -799,7 +799,9 @@ def get_context_data(self, **kwargs):
         context['events'] = events
         context['news'] = News.objects.all().order_by('-created')
 
-        competitions = Competition.objects.filter(status='open').annotate(num_participants=Count('participations'))
+        competitions = Competition.objects.filter(
+            status__in=['frozen','paused','open','closing'])\
+            .annotate(num_participants=Count('participations'))
         # Count active bots of the user in each competition
         if self.request.user.is_authenticated:
             competitions = (competitions.annotate(n_active_bots=Sum(Case(
@@ -993,6 +995,13 @@ def label_from_instance(self, bot_object):
 
 class RequestMatchForm(forms.Form):
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # Pre fill the map pool selection, for user convenience
+        self.initial['map_pool'] = MapPool.objects.filter(id=config.MATCH_REQUESTS_PREFILL_MAP_POOL_ID).first()
+
+
     MATCHUP_TYPE_CHOICES = (
         ('specific_matchup', 'Specific Matchup'),
         ('random_ladder_bot', 'Random Ladder Bot'),

aiarena/settings.py

@@ -59,6 +59,7 @@
     }
 }
 
+
 # Application definition
 
 INSTALLED_APPS = [
@@ -216,6 +217,8 @@
     'MATCH_REQUEST_LIMIT_PLATINUM_TIER': (
     2000, 'The periodic limit of match requests for a platinum patreon tier user.'),
     'MATCH_REQUEST_LIMIT_DIAMOND_TIER': (8000, 'The periodic limit of match requests for a diamond patreon tier user.'),
+    'MATCH_REQUESTS_PREFILL_MAP_POOL_ID': (0, 'The ID of the map pool that should be selected by default '
+                                              'when requesting matches.'),
     'REQUESTED_MATCHES_LIMIT_PERIOD': (
         timedelta(days=30), 'The period length for which a user''s match request limit applies.', timedelta),
     'BOT_ZIP_SIZE_LIMIT_IN_MB_FREE_TIER': (
@@ -260,7 +263,7 @@
     'Match Requests': ('MATCH_REQUEST_LIMIT_FREE_TIER', 'MATCH_REQUEST_LIMIT_BRONZE_TIER',
                        'MATCH_REQUEST_LIMIT_SILVER_TIER', 'MATCH_REQUEST_LIMIT_GOLD_TIER',
                        'MATCH_REQUEST_LIMIT_PLATINUM_TIER', 'MATCH_REQUEST_LIMIT_DIAMOND_TIER',
-                       'REQUESTED_MATCHES_LIMIT_PERIOD',),
+                       'REQUESTED_MATCHES_LIMIT_PERIOD', 'MATCH_REQUESTS_PREFILL_MAP_POOL_ID',),
     'File size limits': ('BOT_ZIP_SIZE_LIMIT_IN_MB_FREE_TIER', 'BOT_ZIP_SIZE_LIMIT_IN_MB_BRONZE_TIER',
                          'BOT_ZIP_SIZE_LIMIT_IN_MB_SILVER_TIER', 'BOT_ZIP_SIZE_LIMIT_IN_MB_GOLD_TIER',
                          'BOT_ZIP_SIZE_LIMIT_IN_MB_PLATINUM_TIER', 'BOT_ZIP_SIZE_LIMIT_IN_MB_DIAMOND_TIER',),

docker/Dockerfile

@@ -0,0 +1,14 @@
+FROM python:3.7-slim
+
+RUN apt-get update \
+    && apt-get install -y gcc libmariadb-dev
+
+COPY . /app
+
+WORKDIR /app/pip
+RUN pip install --upgrade pip
+RUN python pip-install.py
+RUN pip install -r requirements.txt
+RUN pip install -r requirements.DEVELOPMENT.txt
+
+WORKDIR /app

docker/local/.env

@@ -0,0 +1,7 @@
+# PERSISTENCE LOCAL SETUP
+MYSQL_DATABASE=aiarena
+MYSQL_USER=aiarena
+MYSQL_PASSWORD=aiarena
+MYSQL_HOST=aiarena-mysql
+MYSQL_PORT=3306
+MYSQL_ROOT_PASSWORD=root_password

docker/local/docker-compose.yml

@@ -0,0 +1,63 @@
+version: '3.8'
+
+services:
+
+  aiarena-redis:
+    image: redis:latest
+    container_name: aiarena-redis
+    restart: unless-stopped
+    ports:
+      - "6379:6379"
+    networks:
+      - aiarena-network
+    volumes:
+      - aiarena-redis-data:/data
+
+  aiarena-mysql:
+    image: mysql:5.7
+    container_name: aiarena-mysql
+    restart: unless-stopped
+    env_file:
+      - .env
+    ports:
+      - "3306:3306"
+    networks:
+      - aiarena-network
+    volumes:
+      - ./mysql/custom_init.sql:/docker-entrypoint-initdb.d/1.sql
+      - aiarena-mysql-data:/var/lib/mysql
+
+  aiarena-web:
+    build:
+      dockerfile: ./docker/Dockerfile
+      context: ../../
+    container_name: aiarena-web
+    restart: unless-stopped
+    env_file:
+      - .env
+    ports:
+      - "8000:8000"
+    networks:
+      - aiarena-network
+    volumes:
+      - aiarena-web-data:/data
+      - ../.:/app
+    depends_on:
+      - aiarena-redis
+      - aiarena-mysql
+    command: >
+      sh -c "python /app/manage.py collectstatic --noinput &&
+             python /app/manage.py migrate &&
+             python /app/manage.py runserver 0.0.0.0:8000"
+
+
+volumes:
+  aiarena-redis-data:
+    name: aiarena-redis-data
+  aiarena-mysql-data:
+    name: aiarena-mysql-data
+  aiarena-web-data:
+    name: aiarena-web-data
+
+networks:
+  aiarena-network:

docker/local/mysql/custom_init.sql

@@ -0,0 +1,3 @@
+CREATE DATABASE aiarena;
+CREATE USER aiarena IDENTIFIED BY 'aiarena';
+GRANT ALL PRIVILEGES ON aiarena.* TO aiarena WITH GRANT OPTION;