From 7db8936a01a4e2022e022c6d0843a14a3e336f23 Mon Sep 17 00:00:00 2001
From: Lukas Schreiner <lukas.schreiner@fls-wiesbaden.de>
Date: Mon, 29 May 2023 09:16:14 +0200
Subject: [PATCH 1/3] Update dependencies, fix freezer

---
 .gitlab-ci.yml   |  2 ++
 flsvplan.py      |  2 +-
 requirements.txt |  2 +-
 setup.py         | 21 +++++++++++----------
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce49a47..e3f02ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -90,6 +90,7 @@ stages:
       fi 
   rules:
     - if: ($CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "develop") && $BUILD_CFG
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
   <<: *art_def
 
 .build_template_win:
@@ -120,6 +121,7 @@ stages:
       }
   rules:
     - if: ($CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "develop") && $BUILD_CFG
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
   <<: *art_def
 
 .publish_template:
diff --git a/flsvplan.py b/flsvplan.py
index 476699f..44bfdc3 100755
--- a/flsvplan.py
+++ b/flsvplan.py
@@ -8,7 +8,7 @@ standin plans for the FLS Wiesbaden framework.
 """
 
 __all__ = []
-__version__ = '4.39.1'
+__version__ = '4.39.2'
 __author__ = 'Lukas Schreiner'
 
 import urllib.parse
diff --git a/requirements.txt b/requirements.txt
index 535ed39..e209726 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
 PyQt5==5.15.9
 cx_Freeze==6.15
 requests==2.31.0
-sentry-sdk==1.24.0
+sentry-sdk==1.12.0
diff --git a/setup.py b/setup.py
index 192785b..a760c61 100755
--- a/setup.py
+++ b/setup.py
@@ -111,7 +111,7 @@ flsvplan = Executable(
 	"flsvplan.py",
 	base = base,
 	icon = setupIco,
-	targetName = exeName,
+	target_name = exeName,
 	copyright = setupPublisher
 )
 
@@ -119,7 +119,7 @@ flsvplan_debug = Executable(
 	"flsvplan.py",
 	base = None,
 	icon = setupIco,
-	targetName = exeDebug,
+	target_name = exeDebug,
 	copyright = setupPublisher
 )
 
@@ -127,16 +127,17 @@ buildOpts = {
 	'include_files': files,
 	'zip_include_packages': [
 		'PyQt5.QtNetwork', 'PyQt5.sip', 'PyQt5.QtCore', 'PyQt5.QtGui', 'PyQt5.QtWidgets', 'PyQt5', 
-		'sip', 'sentry_sdk'
-	],
+		'sip', 'queue'
+	] + [
+		'sentry_sdk', 'sentry_sdk.crons.api', 'sentry_sdk.integrations.logging', 
+		'sentry_sdk.integrations.stdlib', 'sentry_sdk.integrations.excepthook', 
+		'sentry_sdk.integrations.dedupe', 'sentry_sdk.integrations.atexit', 
+		'sentry_sdk.integrations.modules', 'sentry_sdk.integrations.argv', 
+		'sentry_sdk.integrations.threading'
+	] + SENTRY_INTEGRATIONS,
 	'packages': ['planparser'],
+	'excludes': ['tkinter'],
 	'include_msvcr': True,
-	'includes': [
-		'queue', 'sentry_sdk.integrations.logging', 'sentry_sdk.integrations.stdlib', 
-		'sentry_sdk.integrations.excepthook', 'sentry_sdk.integrations.dedupe',
-		'sentry_sdk.integrations.atexit', 'sentry_sdk.integrations.modules', 
-		'sentry_sdk.integrations.argv', 'sentry_sdk.integrations.threading'
-	] + SENTRY_INTEGRATIONS,
 	'build_exe': os.path.join(buildDir, 'vplan-{:s}'.format(setupVersion))
 }
 
-- 
GitLab


From 18185e7daacfbf0cd3b3ea6ced05799f779519af Mon Sep 17 00:00:00 2001
From: Lukas Schreiner <lukas.schreiner@fls-wiesbaden.de>
Date: Mon, 29 May 2023 09:17:34 +0200
Subject: [PATCH 2/3] Update dependencies, fix freezer

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e3f02ea..17bc8b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,6 +49,7 @@ stages:
     - python -m venv venv
   rules:
     - if: $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "develop"
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
 
 .env_template_lnx:
   <<: *env_def
-- 
GitLab


From 75265e22f000e681811e84ef95d42761d2d64cbe Mon Sep 17 00:00:00 2001
From: Lukas Schreiner <lukas.schreiner@fls-wiesbaden.de>
Date: Mon, 29 May 2023 09:23:54 +0200
Subject: [PATCH 3/3] Update dependencies, fix freezer

---
 setup.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index a760c61..bd14f27 100755
--- a/setup.py
+++ b/setup.py
@@ -127,9 +127,11 @@ buildOpts = {
 	'include_files': files,
 	'zip_include_packages': [
 		'PyQt5.QtNetwork', 'PyQt5.sip', 'PyQt5.QtCore', 'PyQt5.QtGui', 'PyQt5.QtWidgets', 'PyQt5', 
-		'sip', 'queue'
-	] + [
-		'sentry_sdk', 'sentry_sdk.crons.api', 'sentry_sdk.integrations.logging', 
+		'sip', 
+	],
+	'includes':  [
+		'queue', 
+		'sentry_sdk', 'sentry_sdk.integrations.logging', 
 		'sentry_sdk.integrations.stdlib', 'sentry_sdk.integrations.excepthook', 
 		'sentry_sdk.integrations.dedupe', 'sentry_sdk.integrations.atexit', 
 		'sentry_sdk.integrations.modules', 'sentry_sdk.integrations.argv', 
-- 
GitLab