diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce49a47a5ebd7bc85e9f9faa785710ed0d5bab45..17bc8b6dde5e2cdffa875f08a355cc9e889f79eb 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 @@ -90,6 +91,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 +122,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 476699fa52291aa38fbb4e659853da314dbfb69e..44bfdc31a4bb4bf2e0676b584e005439db755df6 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 535ed396662b779a8d35072f8d4fa5eaac1835c9..e209726a1e84461413a2892d42f8c8948ef4705f 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 192785bddbb06076f846acadb769b8a7c295f445..bd14f27044f4eb832d3607713d3cbe03f81c166f 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,19 @@ buildOpts = { 'include_files': files, 'zip_include_packages': [ 'PyQt5.QtNetwork', 'PyQt5.sip', 'PyQt5.QtCore', 'PyQt5.QtGui', 'PyQt5.QtWidgets', 'PyQt5', - 'sip', 'sentry_sdk' + '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', + '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)) }