Merge pull request #632 from loganharbour/django_5

Bump django to 5 and python 3.13

Author: loganharbour

Makefile

@@ -9,7 +9,7 @@ ifeq ($(firstword $(MAKECMDGOALS)),$(filter $(firstword $(MAKECMDGOALS)), test c
 endif
 
 CIVET_TEST_JOBS ?= 12
-MAX_MISSING_LINES := 80
+MAX_MISSING_LINES := 81
 
 py_files := $(shell git ls-files '*.py')
 

ci/tests/SeleniumTester.py

@@ -109,7 +109,7 @@ class SeleniumTester(StaticLiveServerTestCase):
 
     @classmethod
     def setUpClass(cls):
-        cls.chomedriver_dir = None
+        cls.chromedriver_dir = None
         cls.drivers = WebDriverList(
             cls.create_chrome_driver(),
     # The firefox driver doesn't seem to work properly anymore. Firefox 48, Selenium 0.9.0.

civet/settings.py

@@ -42,25 +42,15 @@
 SECRET_KEY = '-85d^-^foncz90n+p7ap#irn1&$v*5%d!$u!w0m@w2v*m#&698'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
 
 # set to the hosts that urls will have in their names
 # In other words, the hosts that this server will accept connections for
 # Note that this is required when DEBUG = False
 # Ex: ['localhost', 'www.moosebuild.org', 'moosebuild.org']
 ALLOWED_HOSTS = []
 
-SHOW_DEBUG_TOOLBAR = False
-
-def show_debug_toolbar(request):
-    return DEBUG and SHOW_DEBUG_TOOLBAR
-
-# Make the debug toolbar get a local copy of jquery
-DEBUG_TOOLBAR_CONFIG = {"JQUERY_URL": "/static/third_party/jquery-2.1.4/jquery.min.js",
-    'SHOW_TOOLBAR_CALLBACK': show_debug_toolbar
-    }
-
-INSTALLED_APPS = (
+INSTALLED_APPS = [
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -69,11 +59,10 @@ def show_debug_toolbar(request):
     'django.contrib.staticfiles',
     'django.contrib.humanize',
     'ci',
-    'debug_toolbar',
     'corsheaders',
     'django_extensions',
     'civet.apps.scheduleConfig',
-)
+]
 
 MIDDLEWARE = [
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -84,9 +73,12 @@ def show_debug_toolbar(request):
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.security.SecurityMiddleware',
-    'debug_toolbar.middleware.DebugToolbarMiddleware',
 ]
 
+if DEBUG:
+    INSTALLED_APPS += ['debug_toolbar']
+    MIDDLEWARE += ['debug_toolbar.middleware.DebugToolbarMiddleware']
+
 ROOT_URLCONF = 'civet.urls'
 
 TEMPLATES = [

requirements.txt

@@ -1,27 +1,27 @@
-ansi2html==1.7.0
-chardet==4.0.0
+ansi2html==1.9.2
+chardet==5.2.0
 chromedriver_autoinstaller==0.6.4
-coverage==6.4.1
-croniter>=1.3.5
+coverage==7.11.3
+croniter==6.0.0
 DaemonLite==0.0.2
-Django==4.2.26
-django-cors-headers==3.12.0
-django-debug-toolbar==3.4.0
-django-extensions==3.1.5
+Django==5.2.8
+django-cors-headers==4.9.0
+django-debug-toolbar==6.1.0
+django-extensions==4.1
 django-sslserver==0.22
 funcsigs==1.0.2
-idna==3.7
-mock==4.0.3
-oauthlib==3.2.2
-pbr==5.9.0
+idna==3.11
+mock==5.2.0
+oauthlib==3.3.1
+pbr==7.0.3
 py-w3c==0.3.1
-pyflakes==2.4.0
-pytz==2022.1
-requests==2.32.4
-requests-oauthlib==1.3.1
-selenium==4.2.0
-six==1.16.0
-sqlparse==0.5.0
-tblib==1.7.0
+pyflakes==3.4.0
+pytz==2025.2
+requests==2.32.5
+requests-oauthlib==2.0.0
+selenium==4.38.0
+six==1.17.0
+sqlparse==0.5.3
+tblib==3.2.2
 typing==3.7.4.3
-urllib3==1.26.19
+urllib3==2.5.0