ScriptCollection 3.5.89__py3-none-any.whl → 3.5.91__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 +6 -3
- ScriptCollection/TasksForCommonProjectStructure.py +9 -6
- {scriptcollection-3.5.89.dist-info → scriptcollection-3.5.91.dist-info}/METADATA +1 -1
- {scriptcollection-3.5.89.dist-info → scriptcollection-3.5.91.dist-info}/RECORD +7 -7
- {scriptcollection-3.5.89.dist-info → scriptcollection-3.5.91.dist-info}/WHEEL +0 -0
- {scriptcollection-3.5.89.dist-info → scriptcollection-3.5.91.dist-info}/entry_points.txt +0 -0
- {scriptcollection-3.5.89.dist-info → scriptcollection-3.5.91.dist-info}/top_level.txt +0 -0
@@ -32,7 +32,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
|
|
32
32
|
from .ProgramRunnerPopen import ProgramRunnerPopen
|
33
33
|
from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
|
34
34
|
|
35
|
-
version = "3.5.
|
35
|
+
version = "3.5.91"
|
36
36
|
__version__ = version
|
37
37
|
|
38
38
|
|
@@ -112,10 +112,13 @@ class ScriptCollectionCore:
|
|
112
112
|
raise ValueError(f"Version '{current_version}' does not match version-regex '{versiononlyregex}'")
|
113
113
|
|
114
114
|
@GeneralUtilities.check_arguments
|
115
|
-
def push_nuget_build_artifact(self, nupkg_file: str, registry_address: str, api_key: str, verbosity: int = 1):
|
115
|
+
def push_nuget_build_artifact(self, nupkg_file: str, registry_address: str, api_key: str = None, verbosity: int = 1):
|
116
116
|
nupkg_file_name = os.path.basename(nupkg_file)
|
117
117
|
nupkg_file_folder = os.path.dirname(nupkg_file)
|
118
|
-
|
118
|
+
argument = f"nuget push {nupkg_file_name} --force-english-output --source {registry_address}"
|
119
|
+
if api_key is not None:
|
120
|
+
argument = f"{argument} --api-key {api_key}"
|
121
|
+
self.run_program("dotnet", argument, nupkg_file_folder, verbosity)
|
119
122
|
|
120
123
|
@GeneralUtilities.check_arguments
|
121
124
|
def dotnet_build(self, folder: str, projectname: str, configuration: str):
|
@@ -1121,7 +1121,7 @@ class TasksForCommonProjectStructure:
|
|
1121
1121
|
GeneralUtilities.write_text_to_file(reference_index_file, reference_index_file_content)
|
1122
1122
|
|
1123
1123
|
@GeneralUtilities.check_arguments
|
1124
|
-
def push_nuget_build_artifact(self, push_script_file: str, codeunitname: str, registry_address: str,
|
1124
|
+
def push_nuget_build_artifact(self, push_script_file: str, codeunitname: str, registry_address: str, repository_folder_name: str, api_key: str):
|
1125
1125
|
# when pusing to "default public" nuget-server then use registry_address: "nuget.org"
|
1126
1126
|
build_artifact_folder = GeneralUtilities.resolve_relative_path(f"../../Submodules/{repository_folder_name}/{codeunitname}/Other/Artifacts/BuildResult_NuGet", os.path.dirname(push_script_file))
|
1127
1127
|
self.__sc.push_nuget_build_artifact(self.__sc.find_file_by_extension(build_artifact_folder, "nupkg"), registry_address, api_key)
|
@@ -1269,11 +1269,16 @@ class TasksForCommonProjectStructure:
|
|
1269
1269
|
build_repository_folder = GeneralUtilities.resolve_relative_path(f"..{os.path.sep}..", folder_of_create_release_file_file)
|
1270
1270
|
self.assert_no_uncommitted_changes(build_repository_folder)
|
1271
1271
|
|
1272
|
+
repository_folder = GeneralUtilities.resolve_relative_path(f"Submodules{os.path.sep}{createRelease_configuration.repository_folder_name}", build_repository_folder)
|
1273
|
+
mergeInformation = MergeToStableBranchInformationForProjectInCommonProjectFormat(repository_folder, createRelease_configuration.additional_arguments_file, createRelease_configuration.artifacts_folder)
|
1274
|
+
createReleaseInformation = CreateReleaseInformationForProjectInCommonProjectFormat(repository_folder, createRelease_configuration.artifacts_folder, createRelease_configuration.projectname, createRelease_configuration.public_repository_url, mergeInformation.targetbranch, mergeInformation.additional_arguments_file, mergeInformation.export_target, createRelease_configuration.push_artifacts_scripts_folder)
|
1275
|
+
createReleaseInformation.verbosity = createRelease_configuration.verbosity
|
1276
|
+
|
1272
1277
|
self.__sc.git_checkout(build_repository_folder, createRelease_configuration.build_repository_branch)
|
1278
|
+
self.__sc.git_checkout(createReleaseInformation.reference_repository, createRelease_configuration.reference_repository_branch_name)
|
1273
1279
|
|
1274
|
-
repository_folder = GeneralUtilities.resolve_relative_path(f"Submodules{os.path.sep}{createRelease_configuration.repository_folder_name}", build_repository_folder)
|
1275
1280
|
self.__sc.assert_is_git_repository(repository_folder)
|
1276
|
-
|
1281
|
+
self.__sc.assert_is_git_repository(createReleaseInformation.reference_repository)
|
1277
1282
|
|
1278
1283
|
# TODO check if repository_folder-merge-source-branch and repository_folder-merge-target-branch have different commits
|
1279
1284
|
self.assert_no_uncommitted_changes(repository_folder)
|
@@ -1284,8 +1289,6 @@ class TasksForCommonProjectStructure:
|
|
1284
1289
|
mergeInformation.push_source_branch_remote_name = createRelease_configuration.remotename
|
1285
1290
|
new_project_version = self.__standardized_tasks_merge_to_stable_branch(mergeInformation)
|
1286
1291
|
|
1287
|
-
createReleaseInformation = CreateReleaseInformationForProjectInCommonProjectFormat(repository_folder, createRelease_configuration.artifacts_folder, createRelease_configuration.projectname, createRelease_configuration.public_repository_url, mergeInformation.targetbranch, mergeInformation.additional_arguments_file, mergeInformation.export_target, createRelease_configuration.push_artifacts_scripts_folder)
|
1288
|
-
createReleaseInformation.verbosity = createRelease_configuration.verbosity
|
1289
1292
|
self.__standardized_tasks_release_artifact(createReleaseInformation)
|
1290
1293
|
|
1291
1294
|
self.__sc.git_commit(createReleaseInformation.reference_repository, f"Added reference of {createRelease_configuration.projectname} v{new_project_version}")
|
@@ -3089,7 +3092,7 @@ class TasksForCommonProjectStructure:
|
|
3089
3092
|
target = os.path.join(ref_repo, "Reference", update_http_documentation_arguments.product_name)
|
3090
3093
|
GeneralUtilities.ensure_directory_does_not_exist(target)
|
3091
3094
|
shutil.copytree(GeneralUtilities.resolve_relative_path(f"../../Submodules/{update_http_documentation_arguments.product_name}Reference/ReferenceContent", folder_of_this_file), target)
|
3092
|
-
self.__sc.git_commit(ref_repo, f"
|
3095
|
+
self.__sc.git_commit(ref_repo, f"Copied reference of {update_http_documentation_arguments.product_name} v{update_http_documentation_arguments.new_project_version} from repository.")
|
3093
3096
|
|
3094
3097
|
# Sync reference-repository
|
3095
3098
|
self.__sc.git_fetch(ref_repo, update_http_documentation_arguments.common_remote_name)
|
@@ -5,12 +5,12 @@ ScriptCollection/ProgramRunnerBase.py,sha256=2kMIAqdc65UjBAddOZkzy_aFx9h5roZ5a4b
|
|
5
5
|
ScriptCollection/ProgramRunnerEpew.py,sha256=4pjEd0r9Fcz3TTDv0MdTSd5KkigYXcWUVI1X43regfU,6477
|
6
6
|
ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
|
7
7
|
ScriptCollection/RPStream.py,sha256=NRRHL3YSP3D9MuAV2jB_--0KUKCsvJGxeKnxgrRZ9kY,1545
|
8
|
-
ScriptCollection/ScriptCollectionCore.py,sha256=
|
9
|
-
ScriptCollection/TasksForCommonProjectStructure.py,sha256=
|
8
|
+
ScriptCollection/ScriptCollectionCore.py,sha256=ZromJ3Kjpq62EXEi-MGWpjohnv9De9F9oEd9Ixw8OXc,123626
|
9
|
+
ScriptCollection/TasksForCommonProjectStructure.py,sha256=gHVWuGglt25jqq6xR7cf0mKWM3OX2sNHijue2RoYuGw,217056
|
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.91.dist-info/METADATA,sha256=EfZfpHkS52wiNF0wb0ro-Z-pMXNdSb-h5YE8IaFDxRY,7664
|
13
|
+
scriptcollection-3.5.91.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
|
14
|
+
scriptcollection-3.5.91.dist-info/entry_points.txt,sha256=1jAL5AuB8mvdw2v-6E7wCZFThurQxchiQynL8DCi-Yg,3545
|
15
|
+
scriptcollection-3.5.91.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
|
16
|
+
scriptcollection-3.5.91.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|