Merge branch 'develop' into release

Author: mmcinnestaylor

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-slim
+FROM python:3.10-slim
 LABEL maintainer="ACM at FSU <contact@fsu.acm.org>"
 
 ENV PYTHONUNBUFFERED 1
@@ -11,6 +11,8 @@ RUN apt-get update \
   && apt-get install -y --no-install-recommends build-essential \
   # Translations dependencies
   && apt-get install -y gettext \
+  # mysqlclient dependency 
+  && apt-get install -y pkg-config \
   # MariaDB dependency
   && apt-get install -y libmariadb-dev \
   # cleaning up unused files

Pipfile

@@ -4,9 +4,9 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-Django = ">=4,<4.2"
-mysqlclient = "*"
-redis = ">=3"
+Django = ">=4.2,<4.3"
+mysqlclient = ">=1.4.3"
+redis = ">=3.4.0"
 hiredis = "*"
 django-import-export = "*"
 celery = "*"
@@ -20,8 +20,6 @@ channels = "*"
 flower = "*"
 
 [dev-packages]
-pylint = "*"
-autopep8 = "*"
 
 [requires]
-python_version = "3.9"
+python_version = "3.10"

Pipfile.lock

@@ -13,12 +13,12 @@ server {
 
     location = /apple-touch-icon.png {
         access_log off;
-        return 301 $scheme://$server_name/static/core/img/favicons$request_uri;
+        return 301 $scheme://$server_name/static/favicons$request_uri;
     }
 
     location = /favicon.ico {
         access_log off;
-        return 301 $scheme://$server_name/static/core/img/favicons$request_uri;
+        return 301 $scheme://$server_name/static/favicons$request_uri;
     }
 
     location = /robots.txt {

deploy/prod/contestsuite/config/nginx.conf

@@ -217,7 +217,7 @@ services:
             FLOWER_COOKIE_KEY: /run/secrets/contestsuite_flower_cookie_key
         volumes:
             - django_static:/app/static
-            - flower_static:/usr/local/lib/python3.9/site-packages/flower/static
+            - flower_static:/usr/local/lib/python3.10/site-packages/flower/static
         networks:
             - nginx-backend
             - db-backend

deploy/prod/contestsuite/docker-stack.yml

@@ -1,72 +1,61 @@
 -i https://pypi.python.org/simple
-astroid==2.14.2 ; python_full_version >= '3.7.2'
-autopep8==2.0.1
-dill==0.3.6 ; python_version < '3.11'
-isort==5.12.0 ; python_full_version >= '3.8.0'
-lazy-object-proxy==1.9.0 ; python_version >= '3.7'
-mccabe==0.7.0 ; python_version >= '3.6'
-platformdirs==3.0.0 ; python_version >= '3.7'
-pycodestyle==2.10.0 ; python_version >= '3.6'
-pylint==2.16.2
-tomli==2.0.1 ; python_version < '3.11'
-tomlkit==0.11.6 ; python_version >= '3.6'
-typing-extensions==4.5.0 ; python_version >= '3.7'
-wrapt==1.14.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-aiohttp==3.7.4.post0 ; python_version >= '3.6'
-amqp==5.1.1 ; python_version >= '3.6'
-asgiref==3.6.0 ; python_version >= '3.7'
-async-timeout==3.0.1 ; python_full_version >= '3.5.3'
-attrs==22.2.0 ; python_version >= '3.6'
-billiard==3.6.4.0
-celery==5.2.7
-certifi==2022.12.7 ; python_version >= '3.6'
+aiohttp==3.7.4.post0; python_version >= '3.6'
+amqp==5.1.1; python_version >= '3.6'
+asgiref==3.7.2; python_version >= '3.7'
+async-timeout==3.0.1; python_full_version >= '3.5.3'
+attrs==23.1.0; python_version >= '3.7'
+billiard==4.1.0; python_version >= '3.7'
+celery==5.3.1
+certifi==2023.7.22; python_version >= '3.6'
 channels==4.0.0
-chardet==4.0.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-charset-normalizer==3.0.1 ; python_full_version >= '3.6.0'
-click==8.1.3 ; python_version >= '3.7'
-click-didyoumean==0.3.0 ; python_full_version >= '3.6.2' and python_full_version < '4.0.0'
+chardet==4.0.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+charset-normalizer==3.2.0; python_full_version >= '3.7.0'
+click==8.1.7; python_version >= '3.7'
+click-didyoumean==0.3.0; python_full_version >= '3.6.2' and python_full_version < '4.0.0'
 click-plugins==1.1.1
-click-repl==0.2.0
-defusedxml==0.7.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-deprecated==1.2.13 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-diff-match-patch==20200713 ; python_version >= '2.7'
+click-repl==0.3.0; python_version >= '3.6'
+cron-descriptor==1.4.0
+defusedxml==0.7.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+deprecated==1.2.14; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+diff-match-patch==20230430; python_version >= '3.7'
 discord.py==1.7.3
-django==4.1.7
-django-celery-beat==2.4.0
+django==4.2.4
+django-celery-beat==2.5.0
 django-hashid-field==3.3.7
-django-import-export==3.0.2
-django-timezone-field==5.0 ; python_version >= '3.7' and python_version < '4.0'
-et-xmlfile==1.1.0 ; python_version >= '3.6'
-flower==1.2.0
-gunicorn==20.1.0
-hashids==1.3.1 ; python_version >= '2.7'
-hiredis==2.2.2
-humanize==4.6.0 ; python_version >= '3.7'
-idna==3.4 ; python_version >= '3.5'
-kombu==5.2.4 ; python_version >= '3.7'
+django-import-export==3.2.0
+django-timezone-field==6.0; python_version >= '3.8' and python_version < '4.0'
+et-xmlfile==1.1.0; python_version >= '3.6'
+flower==2.0.1
+gunicorn==21.2.0
+hashids==1.3.1; python_version >= '2.7'
+hiredis==2.2.3
+humanize==4.8.0; python_version >= '3.8'
+idna==3.4; python_version >= '3.5'
+kombu==5.3.1; python_version >= '3.8'
 markuppy==1.14
-multidict==6.0.4 ; python_version >= '3.7'
-mysqlclient==2.1.1
+multidict==6.0.4; python_version >= '3.7'
+mysqlclient==2.2.0
 odfpy==1.4.1
-openpyxl==3.1.1
-packaging==23.0 ; python_version >= '3.7'
-prometheus-client==0.16.0 ; python_version >= '3.6'
-prompt-toolkit==3.0.36 ; python_full_version >= '3.6.2'
-python-crontab==2.7.1
-python-dateutil==2.8.2 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-pytz==2022.7.1
-pyyaml==6.0
+openpyxl==3.1.2
+packaging==23.1; python_version >= '3.7'
+prometheus-client==0.17.1; python_version >= '3.6'
+prompt-toolkit==3.0.39; python_full_version >= '3.7.0'
+python-crontab==3.0.0
+python-dateutil==2.8.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+pytz==2023.3
+pyyaml==6.0.1
 redis==4.1.4
-requests==2.28.2
-setuptools==67.3.2 ; python_version >= '3.7'
+requests==2.31.0
 six==1.16.0
-sqlparse==0.4.3 ; python_version >= '3.5'
-tablib[html,ods,xls,xlsx,yaml]==3.3.0 ; python_version >= '3.7'
-tornado==6.2 ; python_version >= '3.7'
-tzdata==2022.7 ; python_version >= '2'
-urllib3==1.26.14 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
-vine==5.0.0 ; python_version >= '3.6'
+sqlparse==0.4.4; python_version >= '3.5'
+tablib[html,ods,xls,xlsx,yaml]==3.5.0; python_version >= '3.8'
+tornado==6.3.3; python_version >= '3.8'
+typing-extensions==4.7.1; python_version >= '3.7'
+tzdata==2023.3; python_version >= '2'
+urllib3==2.0.4; python_version >= '3.7'
+vine==5.0.0; python_version >= '3.6'
 wcwidth==0.2.6
+wrapt==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 xlrd==2.0.1
 xlwt==1.3.0
-yarl==1.8.2 ; python_version >= '3.7'
+yarl==1.9.2; python_version >= '3.7'

requirements-dev.txt

@@ -1,61 +1,61 @@
 -i https://pypi.python.org/simple
-aiohttp==3.7.4.post0 ; python_version >= '3.6'
-amqp==5.1.1 ; python_version >= '3.6'
-asgiref==3.6.0 ; python_version >= '3.7'
-async-timeout==3.0.1 ; python_full_version >= '3.5.3'
-attrs==22.2.0 ; python_version >= '3.6'
-billiard==3.6.4.0
-celery==5.2.7
-certifi==2022.12.7 ; python_version >= '3.6'
+aiohttp==3.7.4.post0; python_version >= '3.6'
+amqp==5.1.1; python_version >= '3.6'
+asgiref==3.7.2; python_version >= '3.7'
+async-timeout==3.0.1; python_full_version >= '3.5.3'
+attrs==23.1.0; python_version >= '3.7'
+billiard==4.1.0; python_version >= '3.7'
+celery==5.3.1
+certifi==2023.7.22; python_version >= '3.6'
 channels==4.0.0
-chardet==4.0.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-charset-normalizer==3.0.1 ; python_full_version >= '3.6.0'
-click==8.1.3 ; python_version >= '3.7'
-click-didyoumean==0.3.0 ; python_full_version >= '3.6.2' and python_full_version < '4.0.0'
+chardet==4.0.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+charset-normalizer==3.2.0; python_full_version >= '3.7.0'
+click==8.1.7; python_version >= '3.7'
+click-didyoumean==0.3.0; python_full_version >= '3.6.2' and python_full_version < '4.0.0'
 click-plugins==1.1.1
-click-repl==0.2.0
-defusedxml==0.7.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-deprecated==1.2.13 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-diff-match-patch==20200713 ; python_version >= '2.7'
+click-repl==0.3.0; python_version >= '3.6'
+cron-descriptor==1.4.0
+defusedxml==0.7.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+deprecated==1.2.14; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+diff-match-patch==20230430; python_version >= '3.7'
 discord.py==1.7.3
-django==4.1.7
-django-celery-beat==2.4.0
+django==4.2.4
+django-celery-beat==2.5.0
 django-hashid-field==3.3.7
-django-import-export==3.0.2
-django-timezone-field==5.0 ; python_version >= '3.7' and python_version < '4.0'
-et-xmlfile==1.1.0 ; python_version >= '3.6'
-flower==1.2.0
-gunicorn==20.1.0
-hashids==1.3.1 ; python_version >= '2.7'
-hiredis==2.2.2
-humanize==4.6.0 ; python_version >= '3.7'
-idna==3.4 ; python_version >= '3.5'
-kombu==5.2.4 ; python_version >= '3.7'
+django-import-export==3.2.0
+django-timezone-field==6.0; python_version >= '3.8' and python_version < '4.0'
+et-xmlfile==1.1.0; python_version >= '3.6'
+flower==2.0.1
+gunicorn==21.2.0
+hashids==1.3.1; python_version >= '2.7'
+hiredis==2.2.3
+humanize==4.8.0; python_version >= '3.8'
+idna==3.4; python_version >= '3.5'
+kombu==5.3.1; python_version >= '3.8'
 markuppy==1.14
-multidict==6.0.4 ; python_version >= '3.7'
-mysqlclient==2.1.1
+multidict==6.0.4; python_version >= '3.7'
+mysqlclient==2.2.0
 odfpy==1.4.1
-openpyxl==3.1.1
-packaging==23.0 ; python_version >= '3.7'
-prometheus-client==0.16.0 ; python_version >= '3.6'
-prompt-toolkit==3.0.36 ; python_full_version >= '3.6.2'
-python-crontab==2.7.1
-python-dateutil==2.8.2 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-pytz==2022.7.1
-pyyaml==6.0
+openpyxl==3.1.2
+packaging==23.1; python_version >= '3.7'
+prometheus-client==0.17.1; python_version >= '3.6'
+prompt-toolkit==3.0.39; python_full_version >= '3.7.0'
+python-crontab==3.0.0
+python-dateutil==2.8.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+pytz==2023.3
+pyyaml==6.0.1
 redis==4.1.4
-requests==2.28.2
-setuptools==67.3.2 ; python_version >= '3.7'
+requests==2.31.0
 six==1.16.0
-sqlparse==0.4.3 ; python_version >= '3.5'
-tablib[html,ods,xls,xlsx,yaml]==3.3.0 ; python_version >= '3.7'
-tornado==6.2 ; python_version >= '3.7'
-typing-extensions==4.5.0 ; python_version >= '3.7'
-tzdata==2022.7 ; python_version >= '2'
-urllib3==1.26.14 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
-vine==5.0.0 ; python_version >= '3.6'
+sqlparse==0.4.4; python_version >= '3.5'
+tablib[html,ods,xls,xlsx,yaml]==3.5.0; python_version >= '3.8'
+tornado==6.3.3; python_version >= '3.8'
+typing-extensions==4.7.1; python_version >= '3.7'
+tzdata==2023.3; python_version >= '2'
+urllib3==2.0.4; python_version >= '3.7'
+vine==5.0.0; python_version >= '3.6'
 wcwidth==0.2.6
-wrapt==1.14.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+wrapt==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 xlrd==2.0.1
 xlwt==1.3.0
-yarl==1.8.2 ; python_version >= '3.7'
+yarl==1.9.2; python_version >= '3.7'

requirements.txt

@@ -19,12 +19,14 @@ def email_annoucement(id):
     try:
         announcement = Announcement.objects.get(id=id)
     except:
-        logger.info('Failed to send announcement with id %d ' % id)
+        logger.error(f'Failed to fetch announcement with id {id}')
     else:
         i=0
         users = User.objects.all()
         messages = []
 
+        # Prepare email per user
+        # Using seperate message per user to avoid address exposure
         for user in users:
             if user.is_active and not user.profile.announcement_email_opt_out:
                 i += 1
@@ -37,21 +39,21 @@ def email_annoucement(id):
         messages = tuple(messages)
         send_mass_mail(messages, fail_silently=False)
 
-        logger.info('Sent announcement to %d users' % i)
+        logger.info(f'Sent announcement to {i} users')
 
 @shared_task
 def discord_announcement(id):
     try:
         announcement = Announcement.objects.get(id=id)
     except:
-        logger.info('Failed to send announcement with id %d ' % id)
+        logger.error(f'Failed to fetch announcement with id {id}')
     else:
-        # Initializing webhook
         try:
+            # Initializing webhook
             webhook = Webhook.from_url(
                 ANNOUNCEMENT_WEBHOOK_URL, adapter=RequestsWebhookAdapter())
         except InvalidArgument:
-            logger.info('Failed to connect to announcement webhook')
+            logger.error('Failed to connect to announcement webhook')
         else:
             url = 'https://'+ALLOWED_HOSTS[0]+announcement.get_absolute_url()
 

src/announcements/tasks.py

@@ -1,4 +1,4 @@
-{% extends 'core/base.html' %}
+{% extends 'base.html' %}
 {% load cache %} 
 {% load static %}
 

src/announcements/templates/announcements/announcement_detail.html

@@ -1,4 +1,4 @@
-{% extends 'core/base.html' %}
+{% extends 'base.html' %}
 {% load cache %}
 {% load static %}