General Updates - part 2.

edaa-org · Nov 19, 2024 · 015d592 · 015d592
1 parent c3bcfc2
commit 015d592
Show file tree

Hide file tree

Showing 16 changed files with 775 additions and 287 deletions.
diff --git a/.github/workflows/Pipeline.yml b/.github/workflows/Pipeline.yml
@@ -4,126 +4,15 @@ on:
   push:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 5'
+# Every Friday at 22:00 - rerun pipeline to check for dependency-based issues
+    - cron: '0 22 * * 5'
 
 jobs:
-
-  Params:
-    uses: pyTooling/Actions/.github/workflows/Parameters.yml@dev
-    with:
-      name: pyEDAA.Launcher
-
-  UnitTesting:
-    uses: pyTooling/Actions/.github/workflows/UnitTesting.yml@dev
-    needs:
-      - Params
+  Pipeline:
+    uses: pyTooling/Actions/.github/workflows/CompletePipeline.yml@r2
     with:
-      jobs: ${{ needs.Params.outputs.python_jobs }}
-      artifact: ${{ fromJson(needs.Params.outputs.artifact_names).unittesting_xml }}
-
-  Coverage:
-    uses: pyTooling/Actions/.github/workflows/CoverageCollection.yml@dev
-    needs:
-      - Params
-    with:
-      python_version: ${{ needs.Params.outputs.python_version }}
-      artifact: ${{ fromJson(needs.Params.outputs.artifact_names).codecoverage_html }}
+      package_namespace: pyEDAA
+      package_name: Launcher
     secrets:
-      codacy_token: ${{ secrets.CODACY_PROJECT_TOKEN }}
-
-  StaticTypeCheck:
-    uses: pyTooling/Actions/.github/workflows/StaticTypeCheck.yml@dev
-    needs:
-      - Params
-    with:
-      python_version: ${{ needs.Params.outputs.python_version }}
-      requirements: '-r tests/requirements.txt'
-      commands: |
-        cd pyEDAA
-        mypy --junit-xml ../StaticTypingSummary.xml --html-report ../htmlmypy -p Launcher
-      html_artifact: ${{ fromJson(needs.Params.outputs.artifact_names).statictyping_html }}
-      junit_report: 'StaticTypingSummary.xml'
-      junit_artifact: ${{ fromJson(needs.Params.outputs.artifact_names).statictyping_junit }}
-
-  PublishTestResults:
-    uses: pyTooling/Actions/.github/workflows/PublishTestResults.yml@dev
-    needs:
-      - UnitTesting
-      - StaticTypeCheck
-
-  Package:
-    uses: pyTooling/Actions/.github/workflows/Package.yml@dev
-    needs:
-      - Params
-      - Coverage
-    with:
-      python_version: ${{ needs.Params.outputs.python_version }}
-      artifact: ${{ fromJson(needs.Params.outputs.artifact_names).package_all }}
-
-  Release:
-    uses: pyTooling/Actions/.github/workflows/Release.yml@dev
-    if: startsWith(github.ref, 'refs/tags')
-    needs:
-      - UnitTesting
-      - Coverage
-      - StaticTypeCheck
-      - Package
-
-  PublishOnPyPI:
-    uses: pyTooling/Actions/.github/workflows/PublishOnPyPI.yml@dev
-    if: startsWith(github.ref, 'refs/tags')
-    needs:
-      - Params
-      - Release
-      - Package
-    with:
-      python_version: ${{ needs.Params.outputs.python_version }}
-      requirements: -r dist/requirements.txt
-      artifact: ${{ fromJson(needs.Params.outputs.artifact_names).package_all }}
-    secrets:
-      PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
-
-#  VerifyDocs:
-#    uses: pyTooling/Actions/.github/workflows/VerifyDocs.yml@dev
-#    needs:
-#      - Params
-#    with:
-#      python_version: ${{ needs.Params.outputs.python_version }}
-
-  BuildTheDocs:
-    uses: pyTooling/Actions/.github/workflows/BuildTheDocs.yml@dev
-    needs:
-      - Params
-#      - VerifyDocs
-    with:
-      artifact: ${{ fromJson(needs.Params.outputs.artifact_names).documentation_html }}
-
-  PublishToGitHubPages:
-    uses: pyTooling/Actions/.github/workflows/PublishToGitHubPages.yml@dev
-    needs:
-      - Params
-      - BuildTheDocs
-      - Coverage
-      - StaticTypeCheck
-    with:
-      doc: ${{ fromJson(needs.Params.outputs.artifact_names).documentation_html }}
-      coverage: ${{ fromJson(needs.Params.outputs.artifact_names).codecoverage_html }}
-      typing: ${{ fromJson(needs.Params.outputs.artifact_names).statictyping_html }}
-
-  ArtifactCleanUp:
-    uses: pyTooling/Actions/.github/workflows/ArtifactCleanUp.yml@dev
-    needs:
-      - Params
-      - UnitTesting
-      - Coverage
-      - StaticTypeCheck
-      - BuildTheDocs
-      - PublishToGitHubPages
-      - PublishTestResults
-    with:
-      package: ${{ fromJson(needs.Params.outputs.artifact_names).package_all }}
-      remaining: |
-        ${{ fromJson(needs.Params.outputs.artifact_names).unittesting_xml }}-*
-        ${{ fromJson(needs.Params.outputs.artifact_names).codecoverage_html }}
-        ${{ fromJson(needs.Params.outputs.artifact_names).statictyping_html }}
-        ${{ fromJson(needs.Params.outputs.artifact_names).documentation_html }}
+      PYPI_TOKEN:           ${{ secrets.PYPI_TOKEN }}
+      CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -6,12 +6,17 @@ __pycache__/
 .coverage
 .cov
 coverage.xml
+/report/coverage
+
+# mypy
+/report/typing
+
+# pytest
+/report/unit
 
 # setuptools
 /build/**/*.*
 /dist/**/*.*
-!/dist/*.cmd
-!/dist/*.ico
 /*.egg-info
 
 # Dependencies
@@ -23,5 +28,8 @@ coverage.xml
 /doc/pyEDAA.Launcher/**/*.*
 !/doc/pyEDAA.Launcher/index.rst
 
-# PyCharm project
+# PyCharm project files
 /.idea/workspace.xml
+
+# Git files
+!.git*