From b7811b6a8bcd79e5c32bee12fe2dab02ba4a8f13 Mon Sep 17 00:00:00 2001 From: Sarah Withee <2601974+geekygirlsarah@users.noreply.github.com> Date: Tue, 3 Feb 2026 17:16:59 -0500 Subject: [PATCH 1/6] Upgrade to Django 6 --- codethesaurus/settings.py | 14 ++++++-------- requirements.txt | Bin 728 -> 1534 bytes 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/codethesaurus/settings.py b/codethesaurus/settings.py index e674b705..fb639737 100644 --- a/codethesaurus/settings.py +++ b/codethesaurus/settings.py @@ -4,10 +4,10 @@ Generated by 'django-admin startproject' using Django 3.1.1. For more information on this file, see -https://docs.djangoproject.com/en/3.1/topics/settings/ +https://docs.djangoproject.com/en/6.0/topics/settings/ For the full list of settings and their values, see -https://docs.djangoproject.com/en/3.1/ref/settings/ +https://docs.djangoproject.com/en/6.0/ref/settings/ """ from pathlib import Path import os @@ -87,7 +87,7 @@ WSGI_APPLICATION = 'codethesaurus.wsgi.application' # Database -# https://docs.djangoproject.com/en/3.1/ref/settings/#databases +# https://docs.djangoproject.com/en/6.0/ref/settings/#databases DATABASES = { 'default': { @@ -101,7 +101,7 @@ DATABASES['default'].update(db_from_env) # Password validation -# https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators +# https://docs.djangoproject.com/en/6.0/ref/settings/#auth-password-validators AUTH_PASSWORD_VALIDATORS = [ { @@ -119,7 +119,7 @@ ] # Internationalization -# https://docs.djangoproject.com/en/3.1/topics/i18n/ +# https://docs.djangoproject.com/en/6.0/topics/i18n/ LANGUAGE_CODE = 'en-us' @@ -127,12 +127,10 @@ USE_I18N = True -USE_L10N = True - USE_TZ = True # Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/3.1/howto/static-files/ +# https://docs.djangoproject.com/en/6.0/howto/static-files/ # https://dev.to/fazledyn/deploying-django-3-1-on-heroku-417 # https://github.com/pkrefta/django-on-heroku/blob/3b2367fec9417230dbfba0235353403865386a41/django_on_heroku/core.py#L106 diff --git a/requirements.txt b/requirements.txt index fcd9666ab949dc21f63deea1282b9e4a43a47156..255b9be7e2ae87bce834b27ba30f95030b51be59 100644 GIT binary patch literal 1534 zcmai!OOMk441|3~;-{o)(|xc9Zd{T02Pl1PH+_aAtG4^&f%)vX4JQ-@Eww$K8Qb~u zyRyzUR$FUpd$q56<~FgJ9{&AopNx!N@sqMvw~Xm1-g~_BSUJ>BZ0gku+Y7m}rM-Fl z$?Gz@6zX1YtBiwQ`h)zS_sQ#5>blpH5!gKsk*yVCRH=Jq3%#8>74|N)$S?ot_06`* zIZEy6#w0kdMv=mKw6+uS$lzUX~H!;Aeomjv)T%1_x6&w8u z9;#dYMMkLyH`0+>{Tq+>Qc+76jMlC(wNi(VUq)5kP($odzt09-Cb*R|@B^on{u!h=SR!~E5~JZJ;B zi%@XCibP}1y>ovbE(fnlckIFWG^)L-=SiA2iWFj2YYu3Ljbir9;KlQQ=+});=_urM z4!`1Rm}R3J_JWL5kIqzZRR;K-=Y+=Kp1y<7%lS~Bb0LSl&y2IjktGr@T>_{Vi^j;-@AJss%!L67kj|I G1^!<(&)|*# literal 728 zcmY*XL6YMj47~FfQ#MXAGY4*a-Kzb;mW+v`#0C~fCC=-o#mpS`=0;Mh)om&ZXMeVK z)Nk4-Dm6!*1@?MSRBJBQno$qBSJUdrU93GdO<6N@0oC9<*qsd?nc_^4_IVP_Xu>2Lp61F>F3BUYI_>BoD=1yy!pZ;s2+uB=7jljw+)K z+j>~=218bQ?OmL%-qkMU_=IBN>(%e?BgDC*+MJ^ayLt@uDv`UK^%Jubq!KhO#bx;W0XCGYaLSizP(_FgL5-PtaEWtwP!kIs#V?yDP;= z14O7Aw-)^%L;_gE$qyvp#t;Y4I`@R7fBm!iP`9hxQsV ds>g*f6 Date: Tue, 3 Feb 2026 17:38:29 -0500 Subject: [PATCH 2/6] Upgrade requirements.txt --- requirements.txt | Bin 1534 -> 1534 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/requirements.txt b/requirements.txt index 255b9be7e2ae87bce834b27ba30f95030b51be59..d03bb905f9dff9d005cfa8c6dbc4ab0970df0b8b 100644 GIT binary patch delta 438 zcmXv~!AiqG5S`8LQeyEWl0yllNb%H~-86}{6e)O751xCHiV7lmsvCy&F9n~Kp!GHakaay6DkJPG!$_)A8Brx>V1>G zzBgnaEDDi`l=2!Lh#jBNJZkVs1lciM!5Q4Z3{L6rJ*L>Ee#RJBg%!Af5^}hvF8BC7 z!Y{Gku#mdC=S`f4A(mb&4Jp2QorYPee0n2Y<9ylau{(B9GZ(~~6K@VDa0};-pRq9o z;czOqh|l1oZ0jMtSbURX%{_}hGH|LE1J%{FtBGobvD1y5^OC&ZIaWh61~R-?U6J66 z3Mqf6%xx>eUllH^mS)8S4|SUmm-=Xr^l7%{o0H!e6w6Im$NB#+52RI4@Q$2Am+QGd DedSBp delta 422 zcmXYt!AiqG5Qb-xU8M$35=xO$iWEIqo86{qLkYbqB6{^$P((xxrc&CcFwEH}@Bw-d zpTY;|V|XjhY|1j5Ec4I)-~O9m6MQ7KKAb_sWy(pYt8+WBQ5Ernt#tSrrUW?AX zlgf?Wy*{S&<+X7@zh1>)>A-IXj*aISmomQ*#QbML_L!!Auakl}-M|7K9MKEA70yq1 zjUzI&^0ThoVVpW=^$eC$^nNlKUi From cdd04d6e66db346947875a4defdfb803313db540 Mon Sep 17 00:00:00 2001 From: Sarah Withee <2601974+geekygirlsarah@users.noreply.github.com> Date: Tue, 3 Feb 2026 17:45:02 -0500 Subject: [PATCH 3/6] Upgrade stuff to work with newer Python 3.14 --- .github/workflows/run-unit-tests.yml | 2 +- .github/workflows/validate-language-info-files.yml | 2 +- .github/workflows/validate-meta-info-file.yml | 2 +- Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 46b4da23..0f686bae 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: 3.11.4 + python-version: 3.14 cache: 'pip' - name: Install dependencies diff --git a/.github/workflows/validate-language-info-files.yml b/.github/workflows/validate-language-info-files.yml index ac513a3d..e057467b 100644 --- a/.github/workflows/validate-language-info-files.yml +++ b/.github/workflows/validate-language-info-files.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: 3.11.4 + python-version: 3.14 cache: 'pip' - name: Install dependencies diff --git a/.github/workflows/validate-meta-info-file.yml b/.github/workflows/validate-meta-info-file.yml index 0a1a80c1..06cc031f 100644 --- a/.github/workflows/validate-meta-info-file.yml +++ b/.github/workflows/validate-meta-info-file.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: 3.11.4 + python-version: 3.14 cache: 'pip' - name: Install dependencies diff --git a/Dockerfile b/Dockerfile index fac3ce74..d9bfc637 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.12-slim +FROM python:3.14-slim ENV PYTHONBUFFERED=1 WORKDIR /code RUN apt-get update && apt-get install -y --no-install-recommends \ From fbed62f5cd2e3e2dfddad5df11df942b6dd8e953 Mon Sep 17 00:00:00 2001 From: Sarah Withee <2601974+geekygirlsarah@users.noreply.github.com> Date: Tue, 3 Feb 2026 17:48:25 -0500 Subject: [PATCH 4/6] Fix version incompatibilities --- requirements.txt | Bin 1534 -> 1536 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/requirements.txt b/requirements.txt index d03bb905f9dff9d005cfa8c6dbc4ab0970df0b8b..5ded7e2f7dcf272940172d751505c13717f16521 100644 GIT binary patch delta 37 ncmeyz-M}-!jMJDwkHG+l4L91)X5=;nu^2#NMw=fqO0xg}pbrPh delta 35 kcmZqR`NuuMjMIcckHG+ljW^oQX5=)7@(eaVWt3(C0Fp}wm;e9( From 1ce698d9dfff4be0b1ed7760c6ecc80f904e276f Mon Sep 17 00:00:00 2001 From: Sarah Withee <2601974+geekygirlsarah@users.noreply.github.com> Date: Tue, 3 Feb 2026 19:02:43 -0500 Subject: [PATCH 5/6] Fix version incompatibilities (pt 2) --- requirements.txt | Bin 1536 -> 1536 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5ded7e2f7dcf272940172d751505c13717f16521..8aa4da2971913fe8169f301f3aba0c793138284e 100644 GIT binary patch delta 16 XcmZqRY2ewghh_2?7NO1OSd16}HCF}R delta 18 ZcmZqRY2ewghlSOYL65<3^FbDSMgTF}1lj-q From 90f6d6c570e35c4886e7e4030c919a1b23c8d5b6 Mon Sep 17 00:00:00 2001 From: Sarah Withee <2601974+geekygirlsarah@users.noreply.github.com> Date: Tue, 3 Feb 2026 22:03:29 -0500 Subject: [PATCH 6/6] Fix Heroku build Python version --- runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime.txt b/runtime.txt index fefae710..8ba7dac2 100644 --- a/runtime.txt +++ b/runtime.txt @@ -1 +1 @@ -python-3.11.4 \ No newline at end of file +python-3.14 \ No newline at end of file