From ad8e1ea14874444d62144966b80e9b9241072d72 Mon Sep 17 00:00:00 2001
From: Aaron Riedener <aaron.riedener@gmail.com>
Date: Sat, 6 Apr 2024 13:46:52 +0200
Subject: [PATCH] [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

---
 koalixcrm/version.py                      |  2 +-
 projectsettings/wsgi.py                   | 17 ++++++++++-------
 requirements.txt                          |  2 +-
 requirements/development_requirements.txt |  6 +++---
 requirements/prod_requirements.txt        | 14 --------------
 setup.py                                  |  4 ++--
 6 files changed, 17 insertions(+), 28 deletions(-)
 delete mode 100644 requirements/prod_requirements.txt

diff --git a/koalixcrm/version.py b/koalixcrm/version.py
index 87fda557..33fa5c2f 100644
--- a/koalixcrm/version.py
+++ b/koalixcrm/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-KOALIXCRM_VERSION = "1.13.0"
\ No newline at end of file
+KOALIXCRM_VERSION = "1.14.0-rc1"
diff --git a/projectsettings/wsgi.py b/projectsettings/wsgi.py
index 63759196..45a8ef94 100644
--- a/projectsettings/wsgi.py
+++ b/projectsettings/wsgi.py
@@ -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()
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 57320cb1..7e257ad0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
--r requirements/prod_requirements.txt
\ No newline at end of file
+-r requirements/development_requirements.txt
\ No newline at end of file
diff --git a/requirements/development_requirements.txt b/requirements/development_requirements.txt
index 9d379932..ccb07f16 100644
--- a/requirements/development_requirements.txt
+++ b/requirements/development_requirements.txt
@@ -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
diff --git a/requirements/prod_requirements.txt b/requirements/prod_requirements.txt
deleted file mode 100644
index 625cc8c5..00000000
--- a/requirements/prod_requirements.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Django==3.2.20
-django-filebrowser==3.14.3
-lxml==5.1.0
-olefile==0.46
-Pillow==7.1.2
-psycopg2-binary==2.8.4
-pytz==2022.4
-django-grappelli==2.15.7
-djangorestframework==3.14.0
-djangorestframework-xml==2.0.0
-markdown==3.1.1
-django-filter==23.5
-pandas==1.5.3
-matplotlib==3.7.5
diff --git a/setup.py b/setup.py
index f54c09c2..a05d38d9 100644
--- a/setup.py
+++ b/setup.py
@@ -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',