ScriptCollection 3.5.109__py3-none-any.whl → 3.5.110__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -33,7 +33,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
-version = "3.5.109"
+version = "3.5.110"
 __version__ = version
 
 

ScriptCollection/TasksForCommonProjectStructure.py

@@ -862,7 +862,7 @@ class TasksForCommonProjectStructure:
         if os.path.isfile(os.path.join(codeunit_folder, runsettings_file)):
             arg = f"{arg} --settings {runsettings_file}"
         arg = f"{arg} /p:CollectCoverage=true /p:CoverletOutput=../Other/Artifacts/TestCoverage/Testcoverage /p:CoverletOutputFormat=cobertura"
-        self.__sc.run_program("dotnet", arg, codeunit_folder, verbosity=verbosity)
+        self.__sc.run_program("dotnet", arg, codeunit_folder, verbosity=verbosity,print_live_output=True)
         target_file = os.path.join(coverage_file_folder,  "TestCoverage.xml")
         GeneralUtilities.ensure_file_does_not_exist(target_file)
         os.rename(os.path.join(coverage_file_folder,  "Testcoverage.cobertura.xml"), target_file)
@@ -2477,11 +2477,18 @@ class TasksForCommonProjectStructure:
         GeneralUtilities.copy_content_of_folder(ca_source_folder, ca_target_folder)
 
     @GeneralUtilities.check_arguments
-    def _internal_get_sorted_codeunits_by_dict(self, codeunits=dict[str, set[str]]) -> list[str]:
-        result_typed = list(TopologicalSorter(codeunits).static_order())
-        result = list()
-        for item in result_typed:
-            result.append(str(item))
+    def _internal_get_sorted_codeunits_by_dict(self, codeunits: dict[str, set[str]]) -> list[str]:
+        sorted_codeunits = {
+            node: sorted(codeunits[node])
+            for node in sorted(codeunits)
+        }
+
+        ts = TopologicalSorter()
+        for node, deps in sorted_codeunits.items():
+            ts.add(node, *deps)
+
+        result_typed = list(ts.static_order())
+        result = [str(item) for item in result_typed]
         return result
 
     @GeneralUtilities.check_arguments
@@ -2546,7 +2553,7 @@ class TasksForCommonProjectStructure:
 
     @GeneralUtilities.check_arguments
     def build_specific_codeunits(self, repository_folder: str, codeunits: list[str], verbosity: int = 1, target_environmenttype: str = "QualityCheck", additional_arguments_file: str = None, is_pre_merge: bool = False, export_target_directory: str = None, assume_dependent_codeunits_are_already_built: bool = True, commandline_arguments: list[str] = [], do_git_clean_when_no_changes: bool = False, note: str = None, check_for_new_files: bool = True) -> None:
-        codeunits_list = {", ".join(codeunits)}
+        codeunits_list = "{"+", ".join(["a","b"])+"}"
         if verbosity > 2:
             GeneralUtilities.write_message_to_stdout(f"Start building codeunits ({codeunits_list}) in repository '{repository_folder}'...")
         self.__sc.assert_is_git_repository(repository_folder)

{scriptcollection-3.5.109.dist-info → scriptcollection-3.5.110.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ScriptCollection
-Version: 3.5.109
+Version: 3.5.110
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke
@@ -39,7 +39,7 @@ Requires-Dist: pyOpenSSL>=25.0.0
 Requires-Dist: PyPDF>=5.4.0
 Requires-Dist: pytest>=8.3.5
 Requires-Dist: PyYAML>=6.0.2
-Requires-Dist: qrcode>=8.1
+Requires-Dist: qrcode>=8.2
 Requires-Dist: send2trash>=1.8.3
 Requires-Dist: twine>=6.1.0
 Requires-Dist: xmlschema>=4.0.1

{scriptcollection-3.5.109.dist-info → scriptcollection-3.5.110.dist-info}/RECORD

@@ -6,11 +6,11 @@ ScriptCollection/ProgramRunnerBase.py,sha256=2kMIAqdc65UjBAddOZkzy_aFx9h5roZ5a4b
 ScriptCollection/ProgramRunnerEpew.py,sha256=4pjEd0r9Fcz3TTDv0MdTSd5KkigYXcWUVI1X43regfU,6477
 ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
 ScriptCollection/SCLog.py,sha256=Gw27Oclcb0ten7_89PD5CdNMoO-at2hGUOYbF-x1HPQ,2296
-ScriptCollection/ScriptCollectionCore.py,sha256=X3jRXN0FRstFN7kPFLnzSZUONMbh_YOPr22cKzDgU78,130404
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=SJ7V9HilnkCBJGCCrObWwAORSI_pXW9zC4uon1O6Xbg,232705
+ScriptCollection/ScriptCollectionCore.py,sha256=2RmUIh9GWngFo9ucfNrTfcTYQ5KD7RI4iJOUSPelqsA,130404
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=5GnI89wwy8_uJH_pZtd0zgZ1C0ReIrZeePjUIwo2sus,232910
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-3.5.109.dist-info/METADATA,sha256=8glqA2n3AUjhZOZV4uXRsgdyHmqgyWwcHbkLUeeKqbc,7694
-scriptcollection-3.5.109.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-scriptcollection-3.5.109.dist-info/entry_points.txt,sha256=3qMbfZEMhc_VTJj-bcLwB8AWcn9iXSB3l0AWpuu52Bs,3689
-scriptcollection-3.5.109.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-3.5.109.dist-info/RECORD,,
+scriptcollection-3.5.110.dist-info/METADATA,sha256=W6tx5MA4Vq71V45HNdsJG1MHJDd9ifbe7OVmgaEm780,7694
+scriptcollection-3.5.110.dist-info/WHEEL,sha256=GHB6lJx2juba1wDgXDNlMTyM13ckjBMKf-OnwgKOCtA,91
+scriptcollection-3.5.110.dist-info/entry_points.txt,sha256=3qMbfZEMhc_VTJj-bcLwB8AWcn9iXSB3l0AWpuu52Bs,3689
+scriptcollection-3.5.110.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-3.5.110.dist-info/RECORD,,

{scriptcollection-3.5.109.dist-info → scriptcollection-3.5.110.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.0.0)
+Generator: setuptools (80.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any