Skip to content

Commit ad8e1ea

Browse files
committed
[Issue #327] ci: Update the wsgi.py to work within the planned prod docker setup see separate repository: https://github.com/KoalixSwitzerland/koalixcrm-prod-container
[Issue #327] ci: Update the requirements of psycopg2-binary to 2.9.9 because of a strange error message [Issue #327] ci: Removed prod requirements as they are already part of the setup.py. When the installation is done via pip install koalix-crm [Issue #327] ci: Update the koalixcrm version to 1.14.0-rc1 [Issue #354] fix: Security problem within Django 3.2.20 and Pillow 7.1.2 by updating both libraries to newer version
1 parent 2cf9382 commit ad8e1ea

File tree

6 files changed

+17
-28
lines changed

6 files changed

+17
-28
lines changed

koalixcrm/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# -*- coding: utf-8 -*-
22

3-
KOALIXCRM_VERSION = "1.13.0"
3+
KOALIXCRM_VERSION = "1.14.0-rc1"

projectsettings/wsgi.py

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
"""
2-
WSGI config for test_koalixcrm project.
2+
WSGI config for koalixcrm project.
33
4-
It exposes the WSGI callable as a module-level variable named ``application``.
4+
This module contains the WSGI application used by Django's development server
5+
and any production WSGI deployments. It should expose a module-level variable
6+
named `application`. Django's `runserver` and `runfcgi` commands discover
7+
this application via the `WSGI_APPLICATION` setting.
58
6-
For more information on this file, see
7-
https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/
9+
Usually this will be called "koalixcrm.wsgi".
810
"""
911

1012
import os
11-
1213
from django.core.wsgi import get_wsgi_application
1314

14-
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "test_koalixcrm.settings")
15+
# The settings module that Django uses. By convention, it is usually in the form "myproject.settings.production"
16+
os.environ.setdefault("DJANGO_SETTINGS_MODULE",
17+
"koalixcrm.projectsettings.settings.production_docker_postgres_settings")
1518

16-
application = get_wsgi_application()
19+
application = get_wsgi_application()

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-r requirements/prod_requirements.txt
1+
-r requirements/development_requirements.txt

requirements/development_requirements.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Django==3.2.20
1+
Django==3.2.25
22
django-filebrowser==3.14.3
33
lxml==5.1.0
44
olefile==0.46
5-
Pillow==7.1.2
6-
psycopg2-binary==2.8.4
5+
Pillow==10.3.0
6+
psycopg2-binary==2.9.9
77
pytz==2022.4
88
django-grappelli==2.15.7
99
djangorestframework==3.14.0

requirements/prod_requirements.txt

-14
This file was deleted.

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
'django-filebrowser==3.14.3',
2020
'lxml==5.1.0',
2121
'olefile==0.46',
22-
"Pillow==10.2.0",
23-
'psycopg2-binary==2.8.4',
22+
"Pillow==10.3.0",
23+
'psycopg2-binary==2.9.9',
2424
'pytz==2022.4',
2525
'django-grappelli==2.15.7',
2626
'djangorestframework==3.14.0',

0 commit comments

Comments
 (0)