edaa-org · Paebbels · Nov 11, 2024 · Nov 11, 2024 · Nov 11, 2024
diff --git a/.btd.yml b/.btd.yml
diff --git a/.github/workflows/Pipeline.yml b/.github/workflows/Pipeline.yml
@@ -8,182 +8,10 @@ on:
     - cron: '0 22 * * 5'
 
 jobs:
-  UnitTestingParams:
-    uses: pyTooling/Actions/.github/workflows/Parameters.yml@dev
+  Pipeline:
+    uses: pyTooling/Actions/.github/workflows/CompletePipeline.yml@r2
     with:
-      name: pySystemRDLModel
-
-  UnitTesting:
-    uses: pyTooling/Actions/.github/workflows/UnitTesting.yml@dev
-    needs:
-      - UnitTestingParams
-    with:
-      jobs: ${{ needs.UnitTestingParams.outputs.python_jobs }}
-      requirements: "-r tests/unit/requirements.txt"
-#      pacboy: "msys/git"
-      unittest_xml_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_xml }}
-      coverage_sqlite_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_sqlite }}
-
-  StaticTypeCheck:
-    uses: pyTooling/Actions/.github/workflows/StaticTypeCheck.yml@dev
-    needs:
-      - UnitTestingParams
-    with:
-      python_version: ${{ needs.UnitTestingParams.outputs.python_version }}
-      commands: |
-        mypy --html-report htmlmypy -p pySystemRDLModel
-      html_report: 'htmlmypy'
-      html_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).statictyping_html }}
-
-  DocCoverage:
-    uses: pyTooling/Actions/.github/workflows/CheckDocumentation.yml@dev
-    needs:
-      - UnitTestingParams
-    with:
-      python_version: ${{ needs.UnitTestingParams.outputs.python_version }}
-      directory: pySystemRDLModel
-#      fail_below: 70
-
-  ConfigParams:
-    uses: pyTooling/Actions/.github/workflows/ExtractConfiguration.yml@dev
-    needs:
-      - DocCoverage
-
-  Package:
-    uses: pyTooling/Actions/.github/workflows/Package.yml@dev
-    needs:
-      - UnitTestingParams
-      - UnitTesting
-    with:
-      python_version: ${{ needs.UnitTestingParams.outputs.python_version }}
-      artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).package_all }}
-
-  PublishCoverageResults:
-    uses: pyTooling/Actions/.github/workflows/PublishCoverageResults.yml@dev
-    needs:
-      - UnitTestingParams
-      - UnitTesting
-    with:
-#      coverage_sqlite_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_sqlite }}
-#      coverage_xml_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_xml }}
-      coverage_json_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_json }}
-      coverage_html_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_html }}
+      package_name: pySystemRDLModel
     secrets:
-      codacy_token: ${{ secrets.CODACY_PROJECT_TOKEN }}
-
-  PublishTestResults:
-    uses: pyTooling/Actions/.github/workflows/PublishTestResults.yml@dev
-    needs:
-      - UnitTestingParams
-      - UnitTesting
-    with:
-      merged_junit_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_xml }}
-
-#  VerifyDocs:
-#    uses: pyTooling/Actions/.github/workflows/VerifyDocs.yml@dev
-#    needs:
-#      - UnitTestingParams
-#    with:
-#      python_version: ${{ needs.UnitTestingParams.outputs.python_version }}
-
-  Documentation:
-    uses: pyTooling/Actions/.github/workflows/SphinxDocumentation.yml@dev
-    needs:
-      - UnitTestingParams
-      - ConfigParams
-      - PublishTestResults
-      - PublishCoverageResults
-#      - VerifyDocs
-    with:
-      python_version: ${{ needs.UnitTestingParams.outputs.python_version }}
-      coverage_report_json_directory: ${{ needs.ConfigParams.outputs.coverage_report_json_directory }}
-      unittest_xml_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_xml }}-ubuntu-native-3.12
-      coverage_json_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_json }}
-      html_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).documentation_html }}
-      latex_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).documentation_latex }}
-
-  IntermediateCleanUp:
-    uses: pyTooling/Actions/.github/workflows/IntermediateCleanUp.yml@dev
-    needs:
-      - UnitTestingParams
-      - PublishCoverageResults
-      - PublishTestResults
-      - Documentation
-    with:
-      sqlite_coverage_artifacts_prefix: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_sqlite }}-
-      xml_unittest_artifacts_prefix: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_xml }}-
-
-#  PDFDocumentation:
-#    uses: pyTooling/Actions/.github/workflows/LaTeXDocumentation.yml@dev
-#    needs:
-#      - UnitTestingParams
-#      - Documentation
-#    with:
-#      document: pySystemRDLModel
-#      latex_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).documentation_latex }}
-#      pdf_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).documentation_pdf }}
-
-  PublishToGitHubPages:
-    uses: pyTooling/Actions/.github/workflows/PublishToGitHubPages.yml@dev
-    needs:
-      - UnitTestingParams
-      - Documentation
-#      - PDFDocumentation
-      - PublishCoverageResults
-      - StaticTypeCheck
-    with:
-      doc: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).documentation_html }}
-#      coverage: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_html }}
-      typing: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).statictyping_html }}
-
-  ReleasePage:
-    uses: pyTooling/Actions/.github/workflows/Release.yml@dev
-    if: startsWith(github.ref, 'refs/tags')
-    needs:
-      - Package
-      - PublishToGitHubPages
-
-  PublishOnPyPI:
-    uses: pyTooling/Actions/.github/workflows/PublishOnPyPI.yml@dev
-    if: startsWith(github.ref, 'refs/tags')
-    needs:
-      - UnitTestingParams
-      - ReleasePage
-    with:
-      python_version: ${{ needs.UnitTestingParams.outputs.python_version }}
-      requirements: -r dist/requirements.txt
-      artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).package_all }}
-    secrets:
-      PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
-
-  ArtifactCleanUp:
-    uses: pyTooling/Actions/.github/workflows/ArtifactCleanUp.yml@dev
-    needs:
-      - UnitTestingParams
-      - UnitTesting
-      - StaticTypeCheck
-      - Documentation
-#      - PDFDocumentation
-      - PublishTestResults
-      - PublishCoverageResults
-      - PublishToGitHubPages
-#      - PublishOnPyPI
-    with:
-      package: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).package_all }}
-      remaining: |
-        ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_xml }}-*
-        ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_html }}-*
-        ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_sqlite }}-*
-        ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_xml }}-*
-        ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_json }}-*
-        ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_html }}-*
-        ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_xml }}
-        ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_html }}
-        ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_sqlite }}
-        ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_xml }}
-        ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_json }}
-        ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_html }}
-        ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).statictyping_html }}
-        ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).documentation_html }}
-        ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).documentation_latex }}
-#        ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).documentation_pdf }}
+      PYPI_TOKEN:           ${{ secrets.PYPI_TOKEN }}
+      CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -6,20 +6,32 @@ __pycache__/
 .coverage
 .cov
 coverage.xml
+/report/coverage
+
+# mypy
+/report/typing
+
+# pytest
+/report/unit
 
 # setuptools
-/build/
-/dist/
+/build/**/*.*
+/dist/**/*.*
 /*.egg-info
 
 # Dependencies
 !requirements.txt
 
 # Sphinx
-/doc/_build/
-/doc/_theme/
-/doc/pySystemRDLModel/**/*.*
-!/doc/pySystemRDLModel/index.rst
+doc/_build/
+doc/pySystemRDLModel/**/*.*
+!doc/pySystemRDLModel/index.rst
 
-# PyCharm project files
+# BuildTheDocs
+doc/_theme/**/*.*
+
+# IntelliJ project files
 /.idea/workspace.xml
+
+# Git files
+!.git*
diff --git a/dist/requirements.txt b/dist/requirements.txt
@@ -1,2 +1,2 @@
-wheel ~= 0.44
+wheel ~= 0.45
 twine ~= 5.1