ScriptCollection 3.5.154__py3-none-any.whl → 3.5.156__py3-none-any.whl

ScriptCollection/GeneralUtilities.py

@@ -367,12 +367,15 @@ class GeneralUtilities:
 
     @staticmethod
     @check_arguments
-    def datetime_to_string_for_logfile_entry(datetime_object: datetime, add_timezone_info_to_log: bool = True) -> str:
-        base_pattern: str = "%Y-%m-%d %H:%M:%S"
-        if add_timezone_info_to_log:
-            return datetime_object.strftime(f'{base_pattern} %z')
+    def datetime_to_string_for_logfile_entry(datetime_object: datetime, add_milliseconds: bool = False) -> str:
+        pattern: str = None
+        if add_milliseconds:
+            pattern = "%Y-%m-%dT%H:%M:%S.%f%z"
         else:
-            return datetime_object.strftime(base_pattern)
+            pattern = "%Y-%m-%dT%H:%M:%S%z"
+        s = datetime_object.strftime(pattern)
+        s = s[:-2] + ":" + s[-2:]
+        return s
 
     @staticmethod
     @check_arguments

ScriptCollection/SCLog.py

@@ -22,6 +22,7 @@ class SCLog:
     add_overhead_to_console: bool
     add_overhead_to_logfile: bool
     print_as_color: bool
+    add_milliseconds_to_logfile_entry: bool
 
     def __init__(self, log_file: str = None, loglevel: LogLevel = None, print_as_color: bool = True):
         self.log_file = log_file
@@ -31,6 +32,7 @@ class SCLog:
             self.loglevel = loglevel
         self.add_overhead_to_console = False
         self.add_overhead_to_logfile = False
+        self.add_milliseconds_to_logfile_entry = False
         self.print_as_color = print_as_color
 
     @GeneralUtilities.check_arguments
@@ -70,7 +72,7 @@ class SCLog:
 
         moment: datetime = datetime.now(datetime.now().astimezone().tzinfo)
 
-        part1 = f"[{GeneralUtilities.datetime_to_string_for_logfile_entry(moment, True)}] ["
+        part1 = f"[{GeneralUtilities.datetime_to_string_for_logfile_entry(moment, self.add_milliseconds_to_logfile_entry)}] ["
         if loglevel == LogLevel.Information:
             part2 = f"Information"
         elif loglevel == LogLevel.Error:

ScriptCollection/ScriptCollectionCore.py

@@ -35,7 +35,7 @@ from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 from .SCLog import SCLog, LogLevel
 
-version = "3.5.154"
+version = "3.5.156"
 __version__ = version
 
 

ScriptCollection/TasksForCommonProjectStructure.py

@@ -2629,12 +2629,6 @@ class TasksForCommonProjectStructure:
         project_version = self.get_version_of_project(repository_folder)
 
         now = datetime.now()
-        if not self.__suport_information_exists(repository_folder, project_version):
-            support_time = timedelta(days=365*2+30*3+1)  # TODO make this configurable
-            until = now + support_time
-            until_day = datetime(until.year, until.month, until.day, 0, 0, 0)
-            from_day = datetime(now.year, now.month, now.day, 0, 0, 0)
-            self.mark_current_version_as_supported(repository_folder, project_version, from_day, until_day)
 
         project_resources_folder = os.path.join(repository_folder, "Other", "Scripts")
         PrepareBuildCodeunits_script_name = "PrepareBuildCodeunits.py"
@@ -2649,6 +2643,12 @@ class TasksForCommonProjectStructure:
                 raise ValueError(f"PrepareBuildCodeunits.py resulted in exitcode {result[0]}.")
 
         self.__do_repository_checks(repository_folder, project_version)
+        if not self.__suport_information_exists(repository_folder, project_version):
+            support_time = timedelta(days=365*2+30*3+1)  # TODO make this configurable
+            until = now + support_time
+            until_day = datetime(until.year, until.month, until.day, 0, 0, 0)
+            from_day = datetime(now.year, now.month, now.day, 0, 0, 0)
+            self.mark_current_version_as_supported(repository_folder, project_version, from_day, until_day)
         self.build_specific_codeunits(repository_folder, codeunits, verbosity, target_environmenttype, additional_arguments_file, is_pre_merge, export_target_directory, False, commandline_arguments, do_git_clean_when_no_changes, note)
 
     @GeneralUtilities.check_arguments
@@ -2677,7 +2677,7 @@ class TasksForCommonProjectStructure:
         sorted_codeunits = [codeunit for codeunit in sorted_codeunits if codeunit in codeunits]
         project_version = self.get_version_of_project(repository_folder)
 
-        message = f"Build codeunits in product {repository_name}... (Started: {GeneralUtilities.datetime_to_string(now_begin)})"
+        message = f"Build codeunits in product {repository_name}... (Started: {GeneralUtilities.datetime_to_string_for_logfile_entry(now_begin)})"
         if note is not None:
             message = f"{message} ({note})"
         GeneralUtilities.write_message_to_stdout(message)
@@ -2720,7 +2720,7 @@ class TasksForCommonProjectStructure:
                 shutil.move(archive_file, target_folder)
 
         now_end: datetime = datetime.now()
-        message2 = f"Finished build codeunits in product {repository_name}. (Finished: {GeneralUtilities.datetime_to_string(now_end)})"
+        message2 = f"Finished build codeunits in product {repository_name}. (Finished: {GeneralUtilities.datetime_to_string_for_logfile_entry(now_end)})"
         if note is not None:
             message2 = f"{message2} ({note})"
         GeneralUtilities.write_message_to_stdout(message2)

{scriptcollection-3.5.154.dist-info → scriptcollection-3.5.156.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ScriptCollection
-Version: 3.5.154
+Version: 3.5.156
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke

{scriptcollection-3.5.154.dist-info → scriptcollection-3.5.156.dist-info}/RECORD

@@ -1,17 +1,17 @@
 ScriptCollection/CertificateUpdater.py,sha256=OAxrG21k_o3W3niOOGNSZzUPJlvolOWc1lRB2dMhc3g,9212
 ScriptCollection/Executables.py,sha256=BojgHGBYn5QqpsdIgn8r8raxb8bE_BUyb-fZ_rCEN0A,37050
-ScriptCollection/GeneralUtilities.py,sha256=t8xp0s10V-MrWYQQiMx0ae3LLTM8G2wPyyWXqeIteXQ,48023
+ScriptCollection/GeneralUtilities.py,sha256=OaecNA7tTFlFA8Wu1dDVspug3DRaRRGbJy4AbpwudpQ,48055
 ScriptCollection/ImageUpdater.py,sha256=qTe3yoqzQJY7LZdXBbjbWvrsSQaeHy1VwmOxaRzU2ig,29305
 ScriptCollection/ProcessesRunner.py,sha256=3mu4ZxzZleQo0Op6o9EYTCFiJfb6kx5ov2YfZfT89mU,1395
 ScriptCollection/ProgramRunnerBase.py,sha256=2kMIAqdc65UjBAddOZkzy_aFx9h5roZ5a4bQNM6RV6Y,2480
 ScriptCollection/ProgramRunnerEpew.py,sha256=4pjEd0r9Fcz3TTDv0MdTSd5KkigYXcWUVI1X43regfU,6477
 ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
-ScriptCollection/SCLog.py,sha256=49NlLEmK_f-icw_uEPq9U3qv-oBTMRcIqSg3jaO8VsA,4360
-ScriptCollection/ScriptCollectionCore.py,sha256=vzMtn001WIBWKPgJak1J42iZjpTDrKIgw4Q3ab50AcY,139260
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=6m8Mu_G_ydkFn2twYrbf9Kt7YoWZjJnuUztJbl4bZPU,247230
+ScriptCollection/SCLog.py,sha256=rMdrEzBKQZBdObPJ9nZ5XCEXRoIFqPh8fAoiX6ZOVuw,4493
+ScriptCollection/ScriptCollectionCore.py,sha256=Rlj0JQG84M1NcsXOKmqJPW3_tkCOJquPreCYTx0Ne4E,139260
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=c4Ohfh8eQK68ObaC2YirTpNy8bht_uHhvxSGQXRgmiQ,247266
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-3.5.154.dist-info/METADATA,sha256=heYQXlbf-hXoNwkR2mPredjwCtwMg1Ybs18Ji-8_JxE,7689
-scriptcollection-3.5.154.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scriptcollection-3.5.154.dist-info/entry_points.txt,sha256=yZlEK0r5Ie7xrSLdlWZgFqzLZiIctsIAUJvDCgrYBRo,4193
-scriptcollection-3.5.154.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-3.5.154.dist-info/RECORD,,
+scriptcollection-3.5.156.dist-info/METADATA,sha256=pXOv4nagWda_5f1tY4A9uqhtBBtlqh4FU-9xUfxMa_Q,7689
+scriptcollection-3.5.156.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scriptcollection-3.5.156.dist-info/entry_points.txt,sha256=yZlEK0r5Ie7xrSLdlWZgFqzLZiIctsIAUJvDCgrYBRo,4193
+scriptcollection-3.5.156.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-3.5.156.dist-info/RECORD,,