ScriptCollection 3.5.46__py3-none-any.whl → 3.5.47__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- ScriptCollection/ScriptCollectionCore.py +1 -1
- ScriptCollection/TasksForCommonProjectStructure.py +1 -1
- {ScriptCollection-3.5.46.dist-info → ScriptCollection-3.5.47.dist-info}/METADATA +1 -1
- {ScriptCollection-3.5.46.dist-info → ScriptCollection-3.5.47.dist-info}/RECORD +7 -7
- {ScriptCollection-3.5.46.dist-info → ScriptCollection-3.5.47.dist-info}/WHEEL +0 -0
- {ScriptCollection-3.5.46.dist-info → ScriptCollection-3.5.47.dist-info}/entry_points.txt +0 -0
- {ScriptCollection-3.5.46.dist-info → ScriptCollection-3.5.47.dist-info}/top_level.txt +0 -0
|
@@ -1227,7 +1227,7 @@ class TasksForCommonProjectStructure:
|
|
|
1227
1227
|
raise ValueError(f"Can not merge because the source-branch and the target-branch are on the same commit (commit-id: {src_branch_commit_id})")
|
|
1228
1228
|
|
|
1229
1229
|
self.__sc.git_checkout(repository_folder, source_branch)
|
|
1230
|
-
self.build_codeunits(repository_folder, verbosity,
|
|
1230
|
+
self.build_codeunits(repository_folder, verbosity, TasksForCommonProjectStructure.get_qualitycheck_environment_name(), additional_arguments_file, True, None, [], True)
|
|
1231
1231
|
self.__sc.git_merge(repository_folder, source_branch, target_branch, False, False, None)
|
|
1232
1232
|
self.__sc.git_commit(repository_folder, f'Merge branch {source_branch} into {target_branch}', stage_all_changes=True, no_changes_behavior=1)
|
|
1233
1233
|
self.__sc.git_checkout(repository_folder, target_branch)
|
|
@@ -5,12 +5,12 @@ ScriptCollection/ProgramRunnerBase.py,sha256=7QAjoqOz6XPmJH19F2k-Z1fFQB_uZnPFvn-
|
|
|
5
5
|
ScriptCollection/ProgramRunnerEpew.py,sha256=C2Rs3YWOWWWJct7XmKphp5CF1tf0j4Fp-ljV2drLTfs,6349
|
|
6
6
|
ScriptCollection/ProgramRunnerPopen.py,sha256=UGWUK0345DmtnD1gsKa1B3tBLDzKKXUGnSbIuCSWzLU,3714
|
|
7
7
|
ScriptCollection/RPStream.py,sha256=NRRHL3YSP3D9MuAV2jB_--0KUKCsvJGxeKnxgrRZ9kY,1545
|
|
8
|
-
ScriptCollection/ScriptCollectionCore.py,sha256=
|
|
9
|
-
ScriptCollection/TasksForCommonProjectStructure.py,sha256=
|
|
8
|
+
ScriptCollection/ScriptCollectionCore.py,sha256=PNQVi6eu-I-t76OYnVSz1N0eksO_iOhOgP7zGzfEVhs,103764
|
|
9
|
+
ScriptCollection/TasksForCommonProjectStructure.py,sha256=6_ix9xbVfNo27NhATMfHN8VkCuIeRSnPfJq60MQDTTU,208674
|
|
10
10
|
ScriptCollection/UpdateCertificates.py,sha256=Eynbgu7k9jLxApP2D_8Il77B6BFjJap6K7oTeEAZYbk,7790
|
|
11
11
|
ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
12
|
-
ScriptCollection-3.5.
|
|
13
|
-
ScriptCollection-3.5.
|
|
14
|
-
ScriptCollection-3.5.
|
|
15
|
-
ScriptCollection-3.5.
|
|
16
|
-
ScriptCollection-3.5.
|
|
12
|
+
ScriptCollection-3.5.47.dist-info/METADATA,sha256=jNsNTEiB18-jTBpu-Gpfa75BY50wbAqm2V4UIX1F73w,7665
|
|
13
|
+
ScriptCollection-3.5.47.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
|
|
14
|
+
ScriptCollection-3.5.47.dist-info/entry_points.txt,sha256=_O7BmQ81LdDfrj5uOhjshg9Xc-tABHQJIxDOyOGRzzI,2397
|
|
15
|
+
ScriptCollection-3.5.47.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
|
|
16
|
+
ScriptCollection-3.5.47.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|