Skip to content

Commit

Permalink
Merge branch other/next-release into main
Browse files Browse the repository at this point in the history
  • Loading branch information
anionDev committed Jan 17, 2023
2 parents 1b36b75 + 96b7a27 commit b3bbf0c
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 9 deletions.
5 changes: 5 additions & 0 deletions Other/Resources/Changelog/v3.3.49.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Release notes

## Changes

- Several nonfunctional changes.
4 changes: 2 additions & 2 deletions ScriptCollection/Other/Hints.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Requirements

The following tools from the [tools-list](https://github.com/anionDev/ScriptCollection/blob/main/ScriptCollection/Other/Reference/ReferenceContent/articles/RequiredToolsForCommonProjectStructure.md#Tools) are required to use this code-unit:
The following tools from the [tools-list](https://github.com/anionDev/ScriptCollection/blob/main/ScriptCollection/Other/Reference/ReferenceContent/articles/RequiredToolsForCommonProjectStructure.md#Tools) are required to build this code-unit:

- `coverage`
- `docfx`
Expand All @@ -12,7 +12,7 @@ The following tools from the [tools-list](https://github.com/anionDev/ScriptColl
- `reportgenerator`
- `scriptcollection`

To create a productive build for a release the following tools are also required:
To create a release the following tools are also required:

- `gh`
- `twine`
2 changes: 1 addition & 1 deletion ScriptCollection/Other/Reference/ReferenceContent/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

The following articles are available in the documentation

- [Required tools for CommonProjectStructure](./RequiredToolsForCommonProjectStructure.md)
- [Required tools for CommonProjectStructure](./Articles/RequiredToolsForCommonProjectStructure.md)
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<coverage version="1.0" date="2023-01-17_21-19-17" tag="v3.3.49">
<assembly name="ScriptCollection">
<class name="Executables.py" coveredlines="0" coverablelines="233" totallines="336" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
<class name="GeneralUtilities.py" coveredlines="417" coverablelines="666" totallines="793" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
<class name="Hardening.py" coveredlines="0" coverablelines="32" totallines="59" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
<class name="ProgramRunnerBase.py" coveredlines="22" coverablelines="28" totallines="42" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
<class name="ProgramRunnerEpew.py" coveredlines="40" coverablelines="103" totallines="122" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
<class name="ProgramRunnerPopen.py" coveredlines="25" coverablelines="37" totallines="50" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
<class name="ScriptCollectionCore.py" coveredlines="490" coverablelines="1090" totallines="1440" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
<class name="TasksForCommonProjectStructure.py" coveredlines="251" coverablelines="1000" totallines="1354" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
<class name="UpdateCertificates.py" coveredlines="0" coverablelines="105" totallines="128" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
</assembly>
</coverage>
2 changes: 1 addition & 1 deletion ScriptCollection/ScriptCollection.codeunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<cps:codeunit xmlns:cps="https://projects.aniondev.de/PublicProjects/Common/ProjectTemplates/-/tree/main/Conventions/RepositoryStructure/CommonProjectStructure" codeunitspecificationversion="1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://projects.aniondev.de/PublicProjects/Common/ProjectTemplates/-/raw/main/Conventions/RepositoryStructure/CommonProjectStructure/codeunit.xsd">
<cps:name>ScriptCollection</cps:name>
<cps:version>3.3.48</cps:version>
<cps:version>3.3.49</cps:version>
<cps:minimalcodecoverageinpercent>30</cps:minimalcodecoverageinpercent>
<cps:dependentcodeunits></cps:dependentcodeunits>
</cps:codeunit>
2 changes: 1 addition & 1 deletion ScriptCollection/ScriptCollection/ScriptCollectionCore.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument


version = "3.3.48"
version = "3.3.49"
__version__ = version


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -654,10 +654,10 @@ def __standardized_tasks_release_buildartifact(self, information: CreateReleaseI
for codeunitname in self.get_codeunits(information.repository):

# Push artifacts to registry
scriptfilename = f"PushBuildArtifacts.{codeunitname}.py"
scriptfilename = f"PushArtifacts.{codeunitname}.py"
push_artifact_to_registry_script = os.path.join(information.push_artifacts_scripts_folder, scriptfilename)
if os.path.isfile(push_artifact_to_registry_script):
GeneralUtilities.write_message_to_stdout(f"Push buildartifact of codeunit {codeunitname}.")
GeneralUtilities.write_message_to_stdout(f"Push artifacts of codeunit {codeunitname}.")
self.__sc.run_program("python", push_artifact_to_registry_script, information.push_artifacts_scripts_folder,
verbosity=information.verbosity, throw_exception_if_exitcode_is_not_zero=True)

Expand Down
2 changes: 1 addition & 1 deletion ScriptCollection/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[build-system]
requires = ["setuptools >= 65.6.3"]
requires = ["setuptools >= 66.0.0"]
build-backend = "setuptools.build_meta"
1 change: 1 addition & 0 deletions ScriptCollection/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ pytest>=7.2.1
qrcode>=7.3.1
ScriptCollection>=3.3.46
send2trash>=1.8.0
twine>=4.0.2
wheel>=0.38.4
xmlschema>=2.1.1
4 changes: 3 additions & 1 deletion ScriptCollection/setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = ScriptCollection
version = 3.3.48
version = 3.3.49
author = Marius Göcke
author_email = [email protected]
description = The ScriptCollection is the place for reusable scripts.
Expand Down Expand Up @@ -31,6 +31,7 @@ zip_safe = False
include_package_data = False
python_requires = >=3.10
install_requires =
autopep8>=2.0.1
build>=0.10.0
coverage>=7.0.5
defusedxml>=0.7.1
Expand All @@ -43,6 +44,7 @@ install_requires =
pytest>=7.2.1
qrcode>=7.3.1
send2trash>=1.8.0
twine>=4.0.2
xmlschema>=2.1.1

[options.packages.find]
Expand Down

0 comments on commit b3bbf0c

Please sign in to comment.