From c3aab2cb08bfc16588bfdd905cc8908f5f5da965 Mon Sep 17 00:00:00 2001 From: Martin Frost Date: Thu, 2 Apr 2026 10:10:56 +0200 Subject: [PATCH 1/5] gitignore app/.env file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 20acf1c..7d975fc 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ __pycache__ /.env /.vscode /import +/app/.env From 50a8b15f85432a11193e8c4769cd31a216f93263 Mon Sep 17 00:00:00 2001 From: Martin Frost Date: Thu, 2 Apr 2026 11:10:39 +0200 Subject: [PATCH 2/5] Upgrade django to 3.0 --- app/fingerweb/settings.py | 3 +++ app/requirements.txt | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/fingerweb/settings.py b/app/fingerweb/settings.py index d962ff2..8b3d941 100644 --- a/app/fingerweb/settings.py +++ b/app/fingerweb/settings.py @@ -153,3 +153,6 @@ # other finders.. "static_precompiler.finders.StaticPrecompilerFinder", ) + +# Things from Django 3.0 upgrade +DEFAULT_AUTO_FIELD='django.db.models.BigAutoField' diff --git a/app/requirements.txt b/app/requirements.txt index 0a4a213..27bf2ba 100644 --- a/app/requirements.txt +++ b/app/requirements.txt @@ -1,12 +1,12 @@ # Required python packages for stacken fingerweb # Can be installed py "pip install -r requirements.txt" -Django ~= 2.2.10 +Django ~= 3.0 -django-static-precompiler ~= 1.8.2 -markdown ~= 3.1.1 +django-static-precompiler ~= 2.4 +markdown ~= 3.7 gunicorn ~= 19.9.0 -django-environ ~= 0.4.5 +django-environ ~= 0.11 psycopg2-binary ~= 2.8.3 python-dateutil ~= 2.8.0 django-post_office ~= 3.5.2 From 9d028b41158f1a8bef17f8c0a465dc6e9900c0a4 Mon Sep 17 00:00:00 2001 From: Martin Frost Date: Thu, 2 Apr 2026 11:21:43 +0200 Subject: [PATCH 3/5] Upgrade Django to 3.2 --- app/fingerweb/settings.py | 2 +- app/requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/fingerweb/settings.py b/app/fingerweb/settings.py index 8b3d941..8bed086 100644 --- a/app/fingerweb/settings.py +++ b/app/fingerweb/settings.py @@ -131,7 +131,7 @@ LANGUAGE_CODE = "en-gb" -TIME_ZONE = "CET" +TIME_ZONE = "Europe/Stockholm" USE_I18N = True diff --git a/app/requirements.txt b/app/requirements.txt index 27bf2ba..1f06a4d 100644 --- a/app/requirements.txt +++ b/app/requirements.txt @@ -1,7 +1,7 @@ # Required python packages for stacken fingerweb # Can be installed py "pip install -r requirements.txt" -Django ~= 3.0 +Django ~= 3.2 django-static-precompiler ~= 2.4 markdown ~= 3.7 @@ -9,4 +9,4 @@ gunicorn ~= 19.9.0 django-environ ~= 0.11 psycopg2-binary ~= 2.8.3 python-dateutil ~= 2.8.0 -django-post_office ~= 3.5.2 +django-post_office ~= 3.6 From 4800c5e0ba82f1c689d3001276dc57800bb18149 Mon Sep 17 00:00:00 2001 From: Martin Frost Date: Thu, 2 Apr 2026 11:44:22 +0200 Subject: [PATCH 4/5] Add missing migrations --- .../migrations/0013_auto_20260402_1144.py | 28 +++++++++++++++++++ .../migrations/0005_auto_20260402_1144.py | 23 +++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 app/finger/migrations/0013_auto_20260402_1144.py create mode 100644 app/services/migrations/0005_auto_20260402_1144.py diff --git a/app/finger/migrations/0013_auto_20260402_1144.py b/app/finger/migrations/0013_auto_20260402_1144.py new file mode 100644 index 0000000..3db6eca --- /dev/null +++ b/app/finger/migrations/0013_auto_20260402_1144.py @@ -0,0 +1,28 @@ +# Generated by Django 3.2.25 on 2026-04-02 09:44 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('finger', '0012_auto_20231012_2216'), + ] + + operations = [ + migrations.AlterField( + model_name='member', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + migrations.AlterField( + model_name='user', + name='first_name', + field=models.CharField(blank=True, max_length=150, verbose_name='first name'), + ), + migrations.AlterField( + model_name='user', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + ] diff --git a/app/services/migrations/0005_auto_20260402_1144.py b/app/services/migrations/0005_auto_20260402_1144.py new file mode 100644 index 0000000..3cb2c28 --- /dev/null +++ b/app/services/migrations/0005_auto_20260402_1144.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.25 on 2026-04-02 09:44 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('services', '0004_serviceuser_modified'), + ] + + operations = [ + migrations.AlterField( + model_name='service', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + migrations.AlterField( + model_name='serviceuser', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + ] From def386a4733d5c0bac339df68839e0f48067eca0 Mon Sep 17 00:00:00 2001 From: Martin Frost Date: Thu, 2 Apr 2026 11:54:43 +0200 Subject: [PATCH 5/5] Fix formatting --- app/fingerweb/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/fingerweb/settings.py b/app/fingerweb/settings.py index 8bed086..3199c02 100644 --- a/app/fingerweb/settings.py +++ b/app/fingerweb/settings.py @@ -155,4 +155,4 @@ ) # Things from Django 3.0 upgrade -DEFAULT_AUTO_FIELD='django.db.models.BigAutoField' +DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"