ScriptCollection 3.5.58__py3-none-any.whl → 3.5.60__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.
@@ -31,7 +31,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
31
31
  from .ProgramRunnerPopen import ProgramRunnerPopen
32
32
  from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
33
33
 
34
- version = "3.5.58"
34
+ version = "3.5.60"
35
35
  __version__ = version
36
36
 
37
37
 
@@ -1397,7 +1397,7 @@ class ScriptCollectionCore:
1397
1397
  if err_line.endswith("\n"):
1398
1398
  err_line = err_line[:-1]
1399
1399
  if print_live_output:
1400
- print(err_line, end='\n', file=sys.stderr, flush=True)
1400
+ print(err_line, end='\n', file=sys.stdout if print_errors_as_information else sys.stderr, flush=True)
1401
1401
  if 0 < len(stderr):
1402
1402
  stderr = stderr+"\n"
1403
1403
  stderr = stderr+err_line
@@ -1902,19 +1902,19 @@ class TasksForCommonProjectStructure:
1902
1902
 
1903
1903
  @GeneralUtilities.check_arguments
1904
1904
  def get_constant_value(self, source_codeunit_folder: str, constant_name: str) -> str:
1905
- self.__sc.assert_is_git_repository(source_codeunit_folder)
1905
+ self.assert_is_codeunit_folder(source_codeunit_folder)
1906
1906
  value_file_relative = self.__get_constant_helper(source_codeunit_folder, constant_name, "path")
1907
1907
  value_file = GeneralUtilities.resolve_relative_path(value_file_relative, os.path.join(source_codeunit_folder, "Other", "Resources", "Constants"))
1908
1908
  return GeneralUtilities.read_text_from_file(value_file)
1909
1909
 
1910
1910
  @GeneralUtilities.check_arguments
1911
1911
  def get_constant_documentation(self, source_codeunit_folder: str, constant_name: str) -> str:
1912
- self.__sc.assert_is_git_repository(source_codeunit_folder)
1912
+ self.assert_is_codeunit_folder(source_codeunit_folder)
1913
1913
  return self.__get_constant_helper(source_codeunit_folder, constant_name, "documentationsummary")
1914
1914
 
1915
1915
  @GeneralUtilities.check_arguments
1916
1916
  def __get_constant_helper(self, source_codeunit_folder: str, constant_name: str, propertyname: str) -> str:
1917
- self.__sc.assert_is_git_repository(source_codeunit_folder)
1917
+ self.assert_is_codeunit_folder(source_codeunit_folder)
1918
1918
  root: etree._ElementTree = etree.parse(os.path.join(source_codeunit_folder, "Other", "Resources", "Constants", f"{constant_name}.constant.xml"))
1919
1919
  results = root.xpath(f'//cps:{propertyname}/text()', namespaces={
1920
1920
  'cps': 'https://projects.aniondev.de/PublicProjects/Common/ProjectTemplates/-/tree/main/Conventions/RepositoryStructure/CommonProjectStructure'
@@ -2224,16 +2224,15 @@ class TasksForCommonProjectStructure:
2224
2224
 
2225
2225
  @GeneralUtilities.check_arguments
2226
2226
  def update_dependencies_of_typical_node_codeunit(self, update_script_file: str, verbosity: int, cmd_args: list[str]) -> None:
2227
- current_folder = os.path.dirname(update_script_file)
2228
2227
  codeunit_folder = GeneralUtilities.resolve_relative_path("..", os.path.dirname(update_script_file))
2229
2228
  ignored_dependencies = self.get_dependencies_which_are_ignored_from_updates(codeunit_folder, True)
2230
2229
  # TODO consider ignored_dependencies
2231
- result = self.run_with_epew("npm", "outdated", current_folder, verbosity, throw_exception_if_exitcode_is_not_zero=False)
2230
+ result = self.run_with_epew("npm", "outdated", codeunit_folder, verbosity, throw_exception_if_exitcode_is_not_zero=False)
2232
2231
  if result[0] == 0:
2233
2232
  return # all dependencies up to date
2234
2233
  elif result[0] == 1:
2235
2234
  package_json_content = None
2236
- package_json_file = f"{current_folder}/package.json"
2235
+ package_json_file = f"{codeunit_folder}/package.json"
2237
2236
  with open(package_json_file, "r", encoding="utf-8") as package_json_file_object:
2238
2237
  package_json_content = json.load(package_json_file_object)
2239
2238
  lines = GeneralUtilities.string_to_lines(result[1])[1:][:-1]
@@ -2247,7 +2246,7 @@ class TasksForCommonProjectStructure:
2247
2246
  package_json_content["devDependencies"][package] = latest_version
2248
2247
  with open(package_json_file, "w", encoding="utf-8") as package_json_file_object:
2249
2248
  json.dump(package_json_content, package_json_file_object, indent=4)
2250
- self.run_with_epew("npm", "install --force", current_folder, verbosity)
2249
+ self.do_npm_install(codeunit_folder, True, verbosity)
2251
2250
  else:
2252
2251
  GeneralUtilities.write_message_to_stderr("Update dependencies resulted in an error.")
2253
2252
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: ScriptCollection
3
- Version: 3.5.58
3
+ Version: 3.5.60
4
4
  Summary: The ScriptCollection is the place for reusable scripts.
5
5
  Home-page: https://github.com/anionDev/ScriptCollection
6
6
  Author: Marius Göcke
@@ -23,7 +23,7 @@ Classifier: Topic :: Utilities
23
23
  Requires-Python: >=3.10
24
24
  Description-Content-Type: text/markdown
25
25
  Requires-Dist: build>=1.2.2.post1
26
- Requires-Dist: coverage>=7.6.10
26
+ Requires-Dist: coverage>=7.6.11
27
27
  Requires-Dist: cyclonedx-bom>=5.1.2
28
28
  Requires-Dist: defusedxml>=0.7.1
29
29
  Requires-Dist: keyboard>=0.13.5
@@ -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=5aLp-2yjIX1oBKO891qi4tFylhkyS6ILPUaSsTwg8W4,111180
9
- ScriptCollection/TasksForCommonProjectStructure.py,sha256=SaX_1ulRQLmO7FzRsIMPXKq48Z7hFYuRJVLi3aJHRj8,212976
8
+ ScriptCollection/ScriptCollectionCore.py,sha256=th3pd2sKt6kBJQ1-7WrjnYOVmbWPfDrYzRkVzmmu6C4,111227
9
+ ScriptCollection/TasksForCommonProjectStructure.py,sha256=IOrvyAgnA2PmXbotfxdXhwIwdciFiXvtPm2URcpDSVc,212887
10
10
  ScriptCollection/UpdateCertificates.py,sha256=Eynbgu7k9jLxApP2D_8Il77B6BFjJap6K7oTeEAZYbk,7790
11
11
  ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
12
- ScriptCollection-3.5.58.dist-info/METADATA,sha256=thH2dW_FlaZFVtJ0KrhOwkBmuKDpt_D-BT2yM8zpY9w,7664
13
- ScriptCollection-3.5.58.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
14
- ScriptCollection-3.5.58.dist-info/entry_points.txt,sha256=AQz2mMJ787Aw5Q_ItC6Q-Mo_DGYlM_OPEkovrgsrRF0,3192
15
- ScriptCollection-3.5.58.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
16
- ScriptCollection-3.5.58.dist-info/RECORD,,
12
+ ScriptCollection-3.5.60.dist-info/METADATA,sha256=SwD2qxvbM1YxPLHJGuKrRLXgCDhJ3pcgJDcih0bPGTc,7664
13
+ ScriptCollection-3.5.60.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
14
+ ScriptCollection-3.5.60.dist-info/entry_points.txt,sha256=AQz2mMJ787Aw5Q_ItC6Q-Mo_DGYlM_OPEkovrgsrRF0,3192
15
+ ScriptCollection-3.5.60.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
16
+ ScriptCollection-3.5.60.dist-info/RECORD,,