Skip to content

Commit 6c9701b

Browse files
Merge pull request #1900 from CentreForDigitalHumanities/feature/upgrade-django
Upgrade django
2 parents 054f9fc + b0ec03f commit 6c9701b

4 files changed

Lines changed: 17 additions & 11 deletions

File tree

backend/ianalyzer/settings.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@
116116

117117
MEDIA_ROOT = os.path.join(BASE_DIR, 'data')
118118

119+
SAML_CSP_HANDLER = ''
120+
119121
# This needs to be the last line of the settings.py, so that all settings can be overridden.
120122
try:
121123
from ianalyzer.settings_local import *
@@ -124,3 +126,4 @@
124126
'No local settings file - configure your environment in backend/ianalyzer/settings_local.py',
125127
Warning
126128
)
129+

backend/requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Django>=4.0.1,<5
1+
Django>=5.2
22
djangorestframework
33
dj-rest-auth[with_social]
44
django-livereload-server

backend/requirements.txt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,10 @@ defusedxml==0.7.1
5555
# via
5656
# djangosaml2
5757
# pysaml2
58+
# python3-openid
59+
django==5.2.7
5860
dj-rest-auth[with-social]==7.2.0
5961
# via -r requirements.in
60-
django==4.2.30
61-
# via
62-
# -r requirements.in
63-
# dj-rest-auth
64-
# django-allauth
65-
# django-livereload-server
66-
# django-revproxy
67-
# djangorestframework
68-
# djangosaml2
6962
django-allauth[socialaccount]==65.15.1
7063
# via dj-rest-auth
7164
django-livereload-server==0.5.1

documentation/First-time-setup.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ These are instructions to set up an Textcavator development server. If you are g
55
## Prerequisites
66

77
* Python == 3.12
8-
* PostgreSQL >= 12, client, server and C libraries
8+
* PostgreSQL >= 14, client, server and C libraries
99
* [ElasticSearch](https://www.elastic.co/) 8. To avoid a lot of errors, choose the option: install elasticsearch with .zip or .tar.gz. ES wil install everything in one folder, and not all over your machine, which happens with other options.
1010
* [Redis](https://www.redis.io/). Recommended installation is [installing from source](https://redis.io/docs/getting-started/installation/install-redis-from-source/)
1111
* [Node.js](https://nodejs.org/). See [.nvmrc](/.nvmrc) for the recommended version.
@@ -28,6 +28,16 @@ yarn postinstall
2828
psql -f backend/create_db.sql
2929
yarn django migrate
3030
```
31+
32+
> [!NOTE]
33+
> With Postgresql 15 later, you may need to grant privileges on the schema too. Use the `psql` command in the terminal, and run the following:
34+
>
35+
> ```
36+
> \c ianalyzer
37+
> grant all privileges on all tables in schema public to ianalyzer;
38+
> ```
39+
>
40+
3141
5. Make a superuser account with `yarn django createsuperuser`
3242
3343
## Setup with Docker

0 commit comments

Comments
 (0)