v0.11.0

edaa-org · Jun 23, 2024 · 4d09415 · 4d09415
2 parents ae5bf3d + 185c3b9
commit 4d09415
Show file tree

Hide file tree

Showing 22 changed files with 2,885 additions and 1,268 deletions.
diff --git a/.github/workflows/Pipeline.yml b/.github/workflows/Pipeline.yml
@@ -19,6 +19,11 @@ jobs:
           java-version: '11'
           distribution: 'temurin'
           architecture: x64
+      - name: ❓ Investigate Java environment
+        run: |
+          ls -lAh /usr/share/gradle-*
+          ls -lAh /usr/share/gradle-*/lib/junit-*
+          ls -lAh /usr/share/gradle-*/lib/hamcrest-*
       - name: ✅ Run the Ant 'junit' target
         run: |
           cd examples/Java/JUnit
@@ -36,11 +41,6 @@ jobs:
     steps:
       - name: ⏬ Checkout repository
         uses: actions/checkout@v4
-      - name: ⏬ Checkout 'google/googletest' repository
-        uses: actions/checkout@v4
-        with:
-          repository: google/googletest
-          path: examples/Cpp/GoogleTest/lib/googletest
       - name: 🔧 Install dependencies
         run: sudo apt-get install -y --no-install-recommends ninja-build
       - name: 🛠 Run CMake
@@ -124,7 +124,7 @@ jobs:
       - UnitTestingParams
     with:
       python_version: ${{ needs.UnitTestingParams.outputs.python_version }}
-      directory: sphinx_reports
+      directory: pyEDAA/Reports
 #      fail_below: 70
 
   Package:
@@ -146,6 +146,9 @@ jobs:
     steps:
       - name: Download JUnit XML files
         uses: actions/download-artifact@v4
+      - name: ✅ Run pytest
+        run: |
+          ls -lAh
 
   PublishCoverageResults:
     uses: pyTooling/Actions/.github/workflows/PublishCoverageResults.yml@r1
@@ -166,7 +169,6 @@ jobs:
       - UnitTestingParams
       - UnitTesting
     with:
-      additional_merge_args: '"--pytest=reduce-depth:pytest.tests.unit"'
       merged_junit_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_xml }}
 
   IntermediateCleanUp:
@@ -208,7 +210,7 @@ jobs:
 #      - UnitTestingParams
 #      - HTMLDocumentation
 #    with:
-#      document: sphinx_reports
+#      document: pyEDAA.Reports
 #      latex_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).documentation_latex }}
 #      pdf_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).documentation_pdf }}
 

diff --git a/doc/requirements.txt b/doc/requirements.txt
@@ -3,7 +3,7 @@
 pyTooling ~= 6.3
 colorama >= 0.4.6
 ruamel.yaml ~= 0.18.6
-setuptools ~= 70.0
+setuptools ~= 70.1
 
 # Enforce latest version on ReadTheDocs
 sphinx ~= 7.3
@@ -21,7 +21,7 @@ sphinxcontrib-mermaid >= 0.9.2
 autoapi >= 2.0.1
 sphinx_design >= 0.5.0
 sphinx-copybutton >= 0.5.2
-sphinx_autodoc_typehints ~= 2.1
+sphinx_autodoc_typehints ~= 2.2
 # changelog>=0.3.5
 sphinx_reports ~= 0.6
 

diff --git a/examples/Cpp/GoogleTest/lib/CMakeLists.txt b/examples/Cpp/GoogleTest/lib/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(googletest)
diff --git a/examples/Cpp/GoogleTest/lib/googletest/CMakeLists.txt b/examples/Cpp/GoogleTest/lib/googletest/CMakeLists.txt
@@ -0,0 +1,10 @@
+include(FetchContent)
+
+FetchContent_Declare(
+  googletest
+  GIT_REPOSITORY https://github.com/google/googletest.git
+  GIT_TAG        f8d7d77c06936315286eb55f8de22cd23c188571 # release-1.14.0
+)
+
+set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+FetchContent_MakeAvailable(googletest)
diff --git a/examples/Java/JUnit/build-github.xml b/examples/Java/JUnit/build-github.xml
@@ -17,16 +17,16 @@
 			<src path="${src}" />
 			<src path="${test}" />
 			<classpath>
-				<pathelement location="/usr/share/gradle-8.7/lib/junit-4.13.2.jar"/>
+				<pathelement location="/usr/share/gradle-8.8/lib/junit-4.13.2.jar"/>
 			</classpath>
 		</javac>
 	</target>
 
 	<target name="junit" depends="compile">
 		<junit haltonerror="true" printsummary="true">
 			<classpath>
-				<pathelement location="/usr/share/gradle-8.7/lib/junit-4.13.2.jar"/>
-				<pathelement location="/usr/share/gradle-8.7/lib/hamcrest-core-1.3.jar"/>
+				<pathelement location="/usr/share/gradle-8.8/lib/junit-4.13.2.jar"/>
+				<pathelement location="/usr/share/gradle-8.8/lib/hamcrest-core-1.3.jar"/>
 				<pathelement location="${build}"/>
 			</classpath>
 			<formatter type="xml"/>

diff --git a/pyEDAA/Reports/Unittesting/JUnit/__init__.py b/pyEDAA/Reports/Unittesting/JUnit/__init__.py
@@ -868,7 +868,7 @@ def _Read(self, xmlSchemaFile: str) -> None:
 			if version_info >= (3, 11):  # pragma: no cover
 				for logEntry in junitParser.error_log:
 					ex.add_note(str(logEntry))
-			raise UnittestException(f"XML syntax or validation error for '{self._path}'.") from ex
+			raise UnittestException(f"XML syntax or validation error for '{self._path}' using XSD schema '{xmlSchemaResourceFile}'.") from ex
 		except Exception as ex:
 			raise UnittestException(f"Couldn't open '{self._path}'.") from ex
 

diff --git a/pyEDAA/Reports/__init__.py b/pyEDAA/Reports/__init__.py
@@ -35,7 +35,7 @@
 __email__ =     "Paebbels@gmail.com"
 __copyright__ = "2021-2024, Electronic Design Automation Abstraction (EDA²)"
 __license__ =   "Apache License, Version 2.0"
-__version__ =   "0.10.0"
+__version__ =   "0.11.0"
 __keywords__ =  ["Reports", "Abstract Model", "Data Model", "Unit Testing", "Testcase", "Testsuite", "OSVVM", "YAML", "XML"]
 
 from enum                 import Enum

diff --git a/pyEDAA/Reports/resources/Generic-JUnit.xsd b/pyEDAA/Reports/resources/Generic-JUnit.xsd
@@ -116,6 +116,11 @@
 
 	<xsd:complexType name="testsuites">
 		<xsd:sequence>
+			<xsd:element name="properties" type="properties" minOccurs="0" maxOccurs="1">
+				<xsd:annotation>
+					<xsd:documentation xml:lang="en">Describes the result of an individual testcase.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
 			<xsd:element name="testsuite" type="testsuite" minOccurs="0" maxOccurs="unbounded">
 				<xsd:annotation>
 					<xsd:documentation xml:lang="en">Describes the aggregated results of multiple testcase.</xsd:documentation>

diff --git a/pyEDAA/Reports/resources/PyTest-JUnit.xsd b/pyEDAA/Reports/resources/PyTest-JUnit.xsd
@@ -60,16 +60,18 @@
 					</xsd:annotation>
 				</xsd:element>
 			</xsd:choice>
-			<xsd:element name="system-out" type="literalblock" minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation xml:lang="en"></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="system-err" type="literalblock" minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation xml:lang="en"></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
+			<xsd:choice minOccurs="0" maxOccurs="unbounded">
+				<xsd:element name="system-out" type="literalblock" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation xml:lang="en"></xsd:documentation>
+					</xsd:annotation>
+				</xsd:element>
+				<xsd:element name="system-err" type="literalblock" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation xml:lang="en"></xsd:documentation>
+					</xsd:annotation>
+				</xsd:element>
+			</xsd:choice>
 		</xsd:sequence>
 		<xsd:attribute name="name" type="xsd:string" use="required" />
 		<xsd:attribute name="classname" type="xsd:string" use="required" />
@@ -96,16 +98,18 @@
 					<xsd:documentation xml:lang="en">Describes the result of an individual testcase.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="system-out" type="literalblock" minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation xml:lang="en"></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="system-err" type="literalblock" minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation xml:lang="en"></xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
+			<xsd:choice minOccurs="0" maxOccurs="unbounded">
+				<xsd:element name="system-out" type="literalblock" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation xml:lang="en"></xsd:documentation>
+					</xsd:annotation>
+				</xsd:element>
+				<xsd:element name="system-err" type="literalblock" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation xml:lang="en"></xsd:documentation>
+					</xsd:annotation>
+				</xsd:element>
+			</xsd:choice>
 		</xsd:sequence>
 		<xsd:attribute name="name" type="xsd:string" use="required" />
 		<xsd:attribute name="errors" type="xsd:nonNegativeInteger" use="optional" />

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [build-system]
 requires = [
-  "setuptools ~= 69.5",
-  "wheel ~= 0.40.0",
+  "setuptools ~= 70.0",
+  "wheel ~= 0.43",
   "pyTooling ~= 6.3"
 ]
 build-backend = "setuptools.build_meta"
@@ -29,13 +29,14 @@ filterwarnings = [
 	"error::DeprecationWarning",
 	"error::PendingDeprecationWarning"
 ]
+junit_logging = "all"
 
 [tool.interrogate]
 color = true
 verbose = 1             # possible values: 0 (minimal output), 1 (-v), 2 (-vv)
-fail-under = 59
-generate-badge = "."
-badge-format = "png"
+fail-under = 80
+#generate-badge = "."
+#badge-format = "png"
 ignore-setters = true
 
 [tool.coverage.run]
@@ -44,9 +45,6 @@ relative_files = true
 omit = [
 	"*site-packages*",
 	"setup.py",
-	"tests/benchmark/*",
-	"tests/performance/*",
-	"tests/platform/*",
 	"tests/unit/*"
 ]
 

diff --git a/tests/data/JUnit/OsvvmLibraries/OSVVMLibraries_OsvvmLibraries.xml b/tests/data/JUnit/OsvvmLibraries/OSVVMLibraries_OsvvmLibraries.xml
@@ -1,3 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<testsuites name="OSVVMLibraries_OsvvmLibraries" timestamp="2024-06-01T07:53:19+02:00" id="2024.05" time="37.936" tests="0" failures="0" errors="0" skipped="0">
+<testsuites name="OSVVMLibraries_OsvvmLibraries" timestamp="2024-06-12T07:46:08+02:00" time="37.416" tests="0" failures="0" errors="0" skipped="0">
+	<properties>
+		<property name="OsvvmVersion" value="2024.06-Dev" />
+		<property name="Simulator" value="GHDL" />
+		<property name="SimulatorVersion" value="4.1.0" />
+	</properties>
 </testsuites>