Merge branch 'main' of https://github.com/GirlsOfSteelRobotics/GOSAtt…

…endanceTrackerV2
GirlsOfSteelRobotics · Jan 22, 2025 · a73a31e · a73a31e
2 parents 3628e04 + fbd1051
commit a73a31e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/AttendanceV2/settings.py b/AttendanceV2/settings.py
@@ -9,7 +9,8 @@
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/5.1/ref/settings/
 """
-
+import os
+import dj_database_url
 from pathlib import Path
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
@@ -80,7 +81,9 @@
         "NAME": BASE_DIR / "db.sqlite3",
     }
 }
-
+# Update database info if it's in $DATABASE_URL environment variable
+db_from_env = dj_database_url.config(conn_max_age=500)
+DATABASES["default"].update(db_from_env)
 
 # Password validation
 # https://docs.djangoproject.com/en/5.1/ref/settings/#auth-password-validators

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,6 @@
 Django~=5.1.4
 autoflake~=2.3.1
 black~=24.10.0
-gspread==6.1.2
+dj-database-url==2.1.0
+gspread==6.1.2
+psycopg2~=2.9.10