Merge pull request #44 from FSU-ACM/dev

Spring '25 updates

Author: mmcinnestaylor

.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"

Pipfile.lock

@@ -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)

README.md

@@ -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:

deploy/docker-compose.yml

@@ -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/configuration.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: