ScriptCollection 3.5.72__py3-none-any.whl → 3.5.73__py3-none-any.whl

ScriptCollection/Executables.py

@@ -534,15 +534,24 @@ def Copy() -> int:
     parser.add_argument('-s', '--source', required=True)
     parser.add_argument('-t', '--target', required=True)
     args = parser.parse_args()
-    if os.path.isfile(args.target) or os.path.isdir(args.target):
+
+    if not (os.path.isfile(args.target) or os.path.isdir(args.target)):
         raise ValueError(f"Can not copy to '{args.target}' because the target already exists.")
-    if os.path.isfile(args.source):
-        shutil.copyfile(args.source, args.target)
-    elif os.path.isdir(args.source):
-        GeneralUtilities.ensure_directory_exists(args.target)
-        GeneralUtilities.copy_content_of_folder(args.source,args.target)
+
+    source=args.source
+    if not os.path.isabs(source):
+        source=GeneralUtilities.resolve_relative_path(source,os.getcwd())
+    target=args.target
+    if not os.path.isabs(target):
+        target=GeneralUtilities.resolve_relative_path(target,os.getcwd())
+
+    if os.path.isfile(source):
+        shutil.copyfile(source, target)
+    elif os.path.isdir(source):
+        GeneralUtilities.ensure_directory_exists(target)
+        GeneralUtilities.copy_content_of_folder(source,target)
     else:
-        raise ValueError(f"'{args.source}' can not be copied because the path does not exist.")
+        raise ValueError(f"'{source}' can not be copied because the path does not exist.")
     return 0
 
 

ScriptCollection/ScriptCollectionCore.py

@@ -32,7 +32,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
-version = "3.5.72"
+version = "3.5.73"
 __version__ = version
 
 
@@ -714,13 +714,13 @@ class ScriptCollectionCore:
         else:
             exit_code, _, stderr, _ = self.run_program_argsasarray("screname", ["--source", source,"--target",target], throw_exception_if_exitcode_is_not_zero=False)  # works platform-indepent
             if exit_code != 0:
-                raise ValueError(f"Fatal error occurrs while moving file '{source}' to '{target}'. StdErr: '{stderr}'")
+                raise ValueError(f"Fatal error occurrs while renaming '{source}' to '{target}'. StdErr: '{stderr}'")
 
     @GeneralUtilities.check_arguments
-    def copy(self, path: str,source:str,target:str) ->None:
+    def copy(self, source:str,target:str) ->None:
         """This function works platform-independent also for non-local-executions if the ScriptCollection commandline-commands are available as global command on the target-system."""
         if self.program_runner.will_be_executed_locally():  # works only locally, but much more performant than always running an external program
-            if os.path.isfile(target) or os.path.isdir(target):
+            if not (os.path.isfile(target) or os.path.isdir(target)):
                 raise ValueError(f"Can not copy to '{target}' because the target already exists.")
             if os.path.isfile(source):
                 shutil.copyfile(source, target)
@@ -732,7 +732,7 @@ class ScriptCollectionCore:
         else:
             exit_code, _, stderr, _ = self.run_program_argsasarray("sccopy", ["--source", source,"--target", target], throw_exception_if_exitcode_is_not_zero=False)  # works platform-indepent
             if exit_code != 0:
-                raise ValueError(f"Fatal error occurrs while removing file '{path}'. StdErr: '{stderr}'")
+                raise ValueError(f"Fatal error occurrs while copying '{source}' to '{target}'. StdErr: '{stderr}'")
 
     @GeneralUtilities.check_arguments
     def __sort_fmd(self, line: str):

ScriptCollection/TasksForCommonProjectStructure.py

@@ -298,8 +298,7 @@ class TasksForCommonProjectStructure:
         verbosity = TasksForCommonProjectStructure.get_verbosity_from_commandline_arguments(commandline_arguments,  verbosity)
         codeunit_folder = str(Path(os.path.dirname(buildscript_file)).parent.parent.absolute())
         repository_folder: str = str(Path(os.path.dirname(buildscript_file)).parent.parent.parent.absolute())
-        target_directory = GeneralUtilities.resolve_relative_path(
-            "../Artifacts/BuildResult_Wheel", os.path.join(self.get_artifacts_folder(repository_folder, codeunitname)))
+        target_directory = GeneralUtilities.resolve_relative_path("../Artifacts/BuildResult_Wheel", os.path.join(self.get_artifacts_folder(repository_folder, codeunitname)))
         GeneralUtilities.ensure_directory_exists(target_directory)
         self.__sc.run_program("python", f"-m build --wheel --outdir {target_directory}", codeunit_folder, verbosity=verbosity)
         self.generate_bom_for_python_project(verbosity, codeunit_folder, codeunitname, commandline_arguments)

{ScriptCollection-3.5.72.dist-info → ScriptCollection-3.5.73.dist-info}/METADATA

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

{ScriptCollection-3.5.72.dist-info → ScriptCollection-3.5.73.dist-info}/RECORD

@@ -1,16 +1,16 @@
-ScriptCollection/Executables.py,sha256=fKPbcz_4mRVmadMicNE4jqXMi6v1YZDB9Swjh63OGO4,29791
+ScriptCollection/Executables.py,sha256=r9dcUehrHVd7gQ2yEOy6QqDz8yOO8Qjp8vzszSUqBls,30022
 ScriptCollection/GeneralUtilities.py,sha256=WSBawT958x_0H-hnPg3S3DGzP3KOQTADtZtP145I-M4,39473
 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/RPStream.py,sha256=NRRHL3YSP3D9MuAV2jB_--0KUKCsvJGxeKnxgrRZ9kY,1545
-ScriptCollection/ScriptCollectionCore.py,sha256=4gb2DrY1_zDoLIek7uMil2hrMjf-KFN323isWwxP604,118617
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=MtbaO3Sgew-cSSapf5XJ_7-ui2w3QGYwpvacX-l2K_w,215356
+ScriptCollection/ScriptCollectionCore.py,sha256=IXyCZCXadGz-g-m2FqKUJBOziJE-YYxxrqTRwN8u5X8,118620
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=MGkpPFaFwEuADbgHWu_0nQBKhHYnarret895LgbGTeI,215343
 ScriptCollection/UpdateCertificates.py,sha256=Eynbgu7k9jLxApP2D_8Il77B6BFjJap6K7oTeEAZYbk,7790
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection-3.5.72.dist-info/METADATA,sha256=SLwR8r23b_SXvy3cLgP6u-mkaO5dVtagFH5Rn78QTyg,7664
-ScriptCollection-3.5.72.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ScriptCollection-3.5.72.dist-info/entry_points.txt,sha256=1jAL5AuB8mvdw2v-6E7wCZFThurQxchiQynL8DCi-Yg,3545
-ScriptCollection-3.5.72.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-ScriptCollection-3.5.72.dist-info/RECORD,,
+ScriptCollection-3.5.73.dist-info/METADATA,sha256=MX0B33z4eIktZBU1HIE-L4oJJF3vVqME4yO269dtT0o,7664
+ScriptCollection-3.5.73.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ScriptCollection-3.5.73.dist-info/entry_points.txt,sha256=1jAL5AuB8mvdw2v-6E7wCZFThurQxchiQynL8DCi-Yg,3545
+ScriptCollection-3.5.73.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+ScriptCollection-3.5.73.dist-info/RECORD,,