Skip to content

Commit

Permalink
[Issue #327] ci: Update the wsgi.py to work within the planned prod d…
Browse files Browse the repository at this point in the history
…ocker 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
  • Loading branch information
scaphilo committed Apr 6, 2024
1 parent 2cf9382 commit ad8e1ea
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 28 deletions.
2 changes: 1 addition & 1 deletion koalixcrm/version.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-

KOALIXCRM_VERSION = "1.13.0"
KOALIXCRM_VERSION = "1.14.0-rc1"
17 changes: 10 additions & 7 deletions projectsettings/wsgi.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
"""
WSGI config for test_koalixcrm project.
WSGI config for koalixcrm project.
It exposes the WSGI callable as a module-level variable named ``application``.
This module contains the WSGI application used by Django's development server
and any production WSGI deployments. It should expose a module-level variable
named `application`. Django's `runserver` and `runfcgi` commands discover
this application via the `WSGI_APPLICATION` setting.
For more information on this file, see
https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/
Usually this will be called "koalixcrm.wsgi".
"""

import os

from django.core.wsgi import get_wsgi_application

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

application = get_wsgi_application()
application = get_wsgi_application()
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-r requirements/prod_requirements.txt
-r requirements/development_requirements.txt
6 changes: 3 additions & 3 deletions requirements/development_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Django==3.2.20
Django==3.2.25
django-filebrowser==3.14.3
lxml==5.1.0
olefile==0.46
Pillow==7.1.2
psycopg2-binary==2.8.4
Pillow==10.3.0
psycopg2-binary==2.9.9
pytz==2022.4
django-grappelli==2.15.7
djangorestframework==3.14.0
Expand Down
14 changes: 0 additions & 14 deletions requirements/prod_requirements.txt

This file was deleted.

4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
'django-filebrowser==3.14.3',
'lxml==5.1.0',
'olefile==0.46',
"Pillow==10.2.0",
'psycopg2-binary==2.8.4',
"Pillow==10.3.0",
'psycopg2-binary==2.9.9',
'pytz==2022.4',
'django-grappelli==2.15.7',
'djangorestframework==3.14.0',
Expand Down

0 comments on commit ad8e1ea

Please sign in to comment.