diff --git a/.btd.yml b/.btd.yml deleted file mode 100644 index 11133ad..0000000 --- a/.btd.yml +++ /dev/null @@ -1,9 +0,0 @@ -input: doc -output: _build -requirements: requirements.txt -target: gh-pages -formats: [ html, pdf, man ] -images: - base: btdi/sphinx:pytooling - latex: btdi/latex -theme: https://codeload.GitHub.com/buildthedocs/sphinx.theme/tar.gz/v1 diff --git a/.github/workflows/Pipeline.yml b/.github/workflows/Pipeline.yml index 2a2f23b..2cb0dba 100644 --- 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: pySVModel - - 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 pySVModel - 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: pySVModel -# 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: pySVModel 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: pySVModel -# 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/dist/requirements.txt b/dist/requirements.txt index 878e3e5..918a0be 100644 --- a/dist/requirements.txt +++ b/dist/requirements.txt @@ -1,2 +1,2 @@ -wheel ~= 0.44 +wheel ~= 0.45 twine ~= 5.1 diff --git a/doc/Dependency.rst b/doc/Dependency.rst index d93773e..8c7a2c8 100644 --- a/doc/Dependency.rst +++ b/doc/Dependency.rst @@ -29,7 +29,7 @@ pySVModel Package +--------------------------------------------------------+-------------+------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+ | **Package** | **Version** | **License** | **Dependencies** | +========================================================+=============+==========================================================================================+=================================================================================================================================+ -| `pyTooling `__ | ≥7.0 | `Apache License, 2.0 `__ | *None* | +| `pyTooling `__ | ≥8.0 | `Apache License, 2.0 `__ | *None* | +--------------------------------------------------------+-------------+------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+ @@ -95,7 +95,7 @@ the mandatory dependencies too. +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ | **Package** | **Version** | **License** | **Dependencies** | +=================================================================================================+==============+==========================================================================================================+======================================================================================================================================================+ -| `pyTooling `__ | ≥7.0 | `Apache License, 2.0 `__ | *None* | +| `pyTooling `__ | ≥8.0 | `Apache License, 2.0 `__ | *None* | +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ | `Sphinx `__ | ≥8.1 | `BSD 3-Clause `__ | *Not yet evaluated.* | +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ @@ -131,9 +131,9 @@ install the mandatory dependencies too. +----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ | **Package** | **Version** | **License** | **Dependencies** | +============================================================================+==============+==========================================================================================================+======================================================================================================================================================+ -| `pyTooling `__ | ≥7.0 | `Apache License, 2.0 `__ | *None* | +| `pyTooling `__ | ≥8.0 | `Apache License, 2.0 `__ | *None* | +----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ -| `wheel `__ | ≥0.44 | `MIT `__ | *Not yet evaluated.* | +| `wheel `__ | ≥0.45 | `MIT `__ | *Not yet evaluated.* | +----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ @@ -162,7 +162,7 @@ install the mandatory dependencies too. +----------------------------------------------------------+--------------+-------------------------------------------------------------------------------------------+----------------------+ | **Package** | **Version** | **License** | **Dependencies** | +==========================================================+==============+===========================================================================================+======================+ -| `wheel `__ | ≥0.44 | `MIT `__ | *Not yet evaluated.* | +| `wheel `__ | ≥0.45 | `MIT `__ | *Not yet evaluated.* | +----------------------------------------------------------+--------------+-------------------------------------------------------------------------------------------+----------------------+ | `Twine `__ | ≥5.1 | `Apache License, 2.0 `__ | *Not yet evaluated.* | +----------------------------------------------------------+--------------+-------------------------------------------------------------------------------------------+----------------------+ diff --git a/pySVModel/__init__.py b/pySVModel/__init__.py index a597303..6f62c02 100644 --- a/pySVModel/__init__.py +++ b/pySVModel/__init__.py @@ -44,7 +44,7 @@ __email__ = "Paebbels@gmail.com" __copyright__ = "2021-2024, Patrick Lehmann" __license__ = "Apache License, Version 2.0" -__version__ = "0.4.1" +__version__ = "0.5.1" @export diff --git a/pyproject.toml b/pyproject.toml index 5997940..9b721a0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,8 +1,8 @@ [build-system] requires = [ "setuptools ~= 75.3", - "wheel ~= 0.44", - "pyTooling ~= 7.0" + "wheel ~= 0.45", + "pyTooling ~= 8.0" ] build-backend = "setuptools.build_meta" diff --git a/requirements.txt b/requirements.txt index ce027df..4db3549 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -pyTooling ~= 7.0 +pyTooling ~= 8.0