Spring '25 updates

.gitattributes

@@ -0,0 +1,5 @@
+# Make sure that shell scripts always use LF -- Windows likes to automatically change it to CRLF
+*.sh text eol=lf
+
+# Make sure Python scripts aren't modified either
+*.py text eol=lf

.github/workflows/pylint.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.10", "3.11", "3.12"]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}

CONTRIBUTING.md

@@ -61,7 +61,6 @@ Programming-Contest-Suite/
     ├── register/
     ├── static/
     ├── templates/
-    ├── bot.py
     └── manage.py
 ```
 
@@ -77,7 +76,6 @@ Programming-Contest-Suite/
 - `register`: user account registration and team creation
 - `static`: target directory for all project static files upon deployment (placeholder dir)
 - `templates`: target directory for all project HTML templates upon deployment
-- `bot.py`: Discord bot which assists in LFG profile verification
 - `manage.py`: Django management entrypoint
 
 ## Testing & Development Server 

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:3.12-slim
 LABEL maintainer="ACM at FSU <contact@fsu.acm.org>"
 
 ENV PYTHONUNBUFFERED=1

Pipfile

@@ -12,14 +12,13 @@ django-import-export = "*"
 celery = "*"
 gunicorn = "*"
 six = "*"
-"discord.py" = "<2.0"
 requests = "*"
 django-hashid-field = "*"
 django-celery-beat = "*"
-channels = "*"
 flower = "*"
+discord-py = "==2.5.0"
 
 [dev-packages]
 
 [requires]
-python_version = "3.10"
+python_version = "3.12"

README.md

@@ -2,10 +2,6 @@
 
 The Programming Contest Suite (PCS) is a set of tools for running [ICPC](https://icpc.global) style programming competitions hosted by the [Association for Computing Machinery Florida State University Student Chapter](https://fsu.acm.org). The suite is designed to work with a [DOMJudge](https://www.domjudge.org/) jury system by facilitating contest registration and management, generating contestant data files required by DOMjudge, and processing contest results. 
 
-### Development Update: January 2024
-
-Future development of this project has been handed off to the ACM at FSU chapter. Please reference `CONTRIBUTING.md` for additional information.
-
 # Features
 
 ### Contestants
@@ -101,3 +97,5 @@ We welcome contributions to the project! Check out `CONTRIBUTING.md` to learn ho
 - [Marlan McInnes-Taylor](https://github.com/mmcinnestaylor) *Creator*
 - [Daniel Riley](https://github.com/danielmriley)
 - [Preston Horne](https://github.com/prestonmhorne)
+- [Hoang Vu](https://github.com/hoangvu5)
+- [Aidan Collins](https://github.com/getsbuffer)

deploy/docker-compose.yml

@@ -14,9 +14,6 @@ services:
             SQL_DATABASE: contestsuite
             SQL_USER: contestadmin
             SQL_PASSWORD: seminoles1!
-
-            # Discord
-            GUILD_ID: # Discord Server ID
         ports:
             - 8000:8000
         volumes:
@@ -29,29 +26,6 @@ services:
             - rabbitmq
             - celery_worker
         restart: unless-stopped
-    scrape_bot:
-        image: contestsuite:dev
-        command: /docker/start.sh bot
-        environment:
-            # Django
-            DEBUG: 'True'
-
-            # Database
-            SQL_DATABASE: contestsuite
-            SQL_USER: contestadmin
-            SQL_PASSWORD: seminoles1!
-
-            # Discord
-            BOT_CHANNEL: # Name of command channel
-            GUILD_ID: # Discord Server ID
-            SCRAPE_BOT_TOKEN: # Token for the member list scraping bot
-        volumes:
-            - ../src:/app
-        networks:
-            - contestsuite
-        depends_on:
-            - mariadb
-            - django
     celery_worker:
         image: contestsuite:dev
         command: /docker/start.sh worker debug
@@ -66,7 +40,6 @@ services:
 
             # Discord
             ANNOUNCEMENT_WEBHOOK_URL: # Webhook URL of the contest announcements channel
-            BOT_CHANNEL_WEBHOOK_URL: # Webhook URL of the bot command channel
         volumes:
             - ../src:/app
         networks:

docs/deployment/configuration.md

@@ -85,7 +85,7 @@ The following variables, located in the main settings file[^1], map to various C
 
 Variable | Default | Description
 ---|---|---
-CELERY_BEAT_SCHEDULE | `{'cleanup-lfg-rosters': {'task': 'lfg.tasks.cleanup_lfg_rosters', 'schedule': 600.0,}, 'scrape-discord-members': {'task': 'lfg.tasks.scrape_discord_members', 'schedule': 1800.0,}, 'verify-lfg-profiles': { 'task': 'lfg.tasks.verify_lfg_profiles', 'schedule': 600.0,},}` | [Docs](https://docs.celeryq.dev/en/stable/userguide/configuration.html#std-setting-beat_schedule)
+CELERY_BEAT_SCHEDULE | `{}` | [Docs](https://docs.celeryq.dev/en/stable/userguide/configuration.html#std-setting-beat_schedule)
 
 ## Flower
 
@@ -106,9 +106,6 @@ The following variables, located in the main settings file[^1], map to various P
 Variable | Default | Description
 ---|---|---
 ANNOUNCEMENT_WEBHOOK_URL | None | URL of Discord server's announcement channel webhook |
-BOT_CHANNEL_WEBHOOK_URL | None | URL of Discord server's bot command channel webhook |
-GUILD_ID | 0 | Discord server's Guid ID |
-SCRAPE_BOT_TOKEN | None | Discord bot token required by the LFG helper bot |
 
 ## Misc
 

docs/deployment/docker/docker_compose.md

@@ -25,9 +25,6 @@ services:
             SQL_DATABASE: contestsuite
             SQL_USER: contestadmin
             SQL_PASSWORD: seminoles1!
-
-            # Discord
-            GUILD_ID: # Discord Server ID
         ports:
             - 8000:8000
         volumes:
@@ -40,29 +37,6 @@ services:
             - rabbitmq
             - celery_worker
         restart: unless-stopped
-    scrape_bot:
-        image: contestsuite:dev
-        command: /docker/start.sh bot
-        environment:
-            # Django
-            DEBUG: 'True'
-
-            # Database
-            SQL_DATABASE: contestsuite
-            SQL_USER: contestadmin
-            SQL_PASSWORD: seminoles1!
-
-            # Discord
-            BOT_CHANNEL: # Name of command channel
-            GUILD_ID: # Discord Server ID
-            SCRAPE_BOT_TOKEN: # Token for the member list scraping bot
-        volumes:
-            - ../src:/app
-        networks:
-            - contestsuite
-        depends_on:
-            - mariadb
-            - django
     celery_worker:
         image: contestsuite:dev
         command: /docker/start.sh worker debug
@@ -77,7 +51,6 @@ services:
 
             # Discord
             ANNOUNCEMENT_WEBHOOK_URL: # Webhook URL of the contest announcements channel
-            BOT_CHANNEL_WEBHOOK_URL: # Webhook URL of the bot command channel
         volumes:
             - ../src:/app
         networks:

docs/deployment/docker/docker_image.md

@@ -24,7 +24,7 @@ REQUIREMENTS | requirements.txt | Path to the manifest file to use during image
 
 ## Run Image
 
-The `Dockerfile` specifies an image capable of running the Django web app, Celery, or a helper Discord bot. The parameters passed to the image's start script `start.sh` determine the container's behavior.
+The `Dockerfile` specifies an image capable of running the Django web app, Celery, or Flower. The parameters passed to the image's start script `start.sh` determine the container's behavior.
 
 ```bash
 docker run <image_name> /docker/start.sh <PROCESS_TYPE> <MODE>
@@ -36,7 +36,6 @@ server | Yes | Gunicorn server bound to the Django app
 worker | No | Celery Worker
 beat | No | Celery Beat
 flower | No | Celery Flower
-bot | No | Discord bot
 
 `MODE` | Default | Usage
 ---|---|---

docs/usage/contest_administration/contest_dashboard.md

@@ -31,13 +31,5 @@ The Contest Dashboard centralizes many of the administrator actions available in
 - **Account Tools**
     - Manually activate a user account. Useful if a registrant has issues verifying their account.
     - Mark a given team as a Faculty Team
-- **Discord Tools**
-    - Creates the Upper/Lower Division Looking For Group roles on a Discord server
-        - server specified by `GUILD_ID` configuration variable
-    - Removes the Upper/Lower Division Looking For Group roles on a Discord server
-        - server specified by `GUILD_ID` configuration variable
-- **Clear Discord Channel**
-    - Clears a channel on a Discord server of all content
-        - server specified by `GUILD_ID` configuration variable
 - **Volunteers**
     - Displays all volunteers registered in the system, whether they have registered for extra credit, and if they've checked into the contest

requirements-dev.txt

@@ -1,61 +1,53 @@
 -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.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.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'
+aiohappyeyeballs==2.4.6; python_version >= '3.9'
+aiohttp==3.11.13; python_version >= '3.9'
+aiosignal==1.3.2; python_version >= '3.9'
+amqp==5.3.1; python_version >= '3.6'
+asgiref==3.8.1; python_version >= '3.8'
+async-timeout==5.0.1; python_version >= '3.8'
+attrs==25.1.0; python_version >= '3.8'
+billiard==4.2.1; python_version >= '3.7'
+celery==5.4.0; python_version >= '3.8'
+certifi==2025.1.31; python_version >= '3.6'
+charset-normalizer==3.4.1; python_version >= '3.7'
+click==8.1.8; python_version >= '3.7'
+click-didyoumean==0.3.1; python_full_version >= '3.6.2'
 click-plugins==1.1.1
 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.2.4
-django-celery-beat==2.5.0
-django-hashid-field==3.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
+cron-descriptor==1.4.5
+diff-match-patch==20241021; python_version >= '3.7'
+discord-py==2.5.0; python_version >= '3.8'
+django==4.2.20; python_version >= '3.8'
+django-celery-beat==2.7.0; python_version >= '3.8'
+django-hashid-field==3.4.1
+django-import-export==4.3.7; python_version >= '3.9'
+django-timezone-field==7.1; python_version >= '3.8' and python_version < '4.0'
+flower==2.0.1; python_version >= '3.7'
+frozenlist==1.5.0; python_version >= '3.8'
+gunicorn==23.0.0; python_version >= '3.7'
 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.2.0
-odfpy==1.4.1
-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.31.0
-six==1.16.0
-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.9.2; python_version >= '3.7'
+hiredis==3.1.0; python_version >= '3.8'
+humanize==4.12.1; python_version >= '3.9'
+idna==3.10; python_version >= '3.6'
+kombu==5.5.0; python_version >= '3.8'
+multidict==6.1.0; python_version >= '3.8'
+mysqlclient==2.2.7; python_version >= '3.8'
+packaging==24.2; python_version >= '3.8'
+prometheus-client==0.21.1; python_version >= '3.8'
+prompt-toolkit==3.0.50; python_full_version >= '3.8.0'
+propcache==0.3.0; python_version >= '3.9'
+python-crontab==3.2.0
+python-dateutil==2.9.0.post0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'
+pytz==2025.1
+redis==5.2.1; python_version >= '3.8'
+requests==2.32.3; python_version >= '3.8'
+six==1.17.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'
+sqlparse==0.5.3; python_version >= '3.8'
+tablib==3.8.0; python_version >= '3.9'
+tornado==6.4.2; python_version >= '3.8'
+typing-extensions==4.12.2; python_version >= '3.8'
+tzdata==2025.1; python_version >= '2'
+urllib3==2.3.0; python_version >= '3.9'
+vine==5.1.0; python_version >= '3.6'
+wcwidth==0.2.13
+yarl==1.18.3; python_version >= '3.9'