diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f3d9959..a6829ff 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -25,9 +25,13 @@ concurrency: jobs: test: strategy: + fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + exclude: + - os: macos-latest + python-version: "3.8" runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -63,8 +67,10 @@ jobs: merge-multiple: true - name: Set project version run: | + REF=${{ github.ref }} if [[ "${{ github.ref_type }}" == "tag" ]]; then - echo "sonar.projectVersion=${{ github.ref }}" >> sonar-project.properties + TAG_NAME=${REF#refs/tags/} + echo "sonar.projectVersion=$TAG_NAME" >> sonar-project.properties fi - name: SonarCloud Scan uses: SonarSource/sonarcloud-github-action@master @@ -116,9 +122,3 @@ jobs: - name: Publish package distributions to PyPI uses: pypa/gh-action-pypi-publish@release/v1 - - - uses: ncipollo/release-action@v1 - with: - draft: true - skipIfReleaseExists: true - generateReleaseNotes: true diff --git a/docs/_config.yml b/docs/_config.yml index f1a4ea5..683476b 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -41,7 +41,6 @@ html: launch_buttons: notebook_interface: "jupyterlab" binderhub_url: "https://mybinder.org" - colab_url: "https://colab.research.google.com" sphinx: extra_extensions: diff --git a/hatch.toml b/hatch.toml index 04d9d46..9fc2869 100644 --- a/hatch.toml +++ b/hatch.toml @@ -22,7 +22,7 @@ check = "pre-commit run {args} --all-files" type = "check mypy {args}" lint = "check ruff {args}" format = "check ruff-format {args}" -test = "pytest --cov --cov-report=term {args}" +test = "pytest --cov --cov-report=term --cov=xcompact3d_toolbox --cov=tests {args}" test-no-cov = "test --no-cov {args}" qa = ["check", "test", "echo '✅ QA passed'"] @@ -61,6 +61,7 @@ serve = ["config", "sphinx-autobuild docs build/_build/html --ignore='**/data/*' [envs.changelog] description = "Changelog handler" +detached = true dependencies = ["towncrier"] [envs.changelog.scripts] @@ -71,7 +72,3 @@ check = "towncrier check {args}" [envs.hatch-static-analysis] config-path = "ruff_defaults.toml" - -[dirs.env] -virtual = ".venv" -pip-compile = ".venv" diff --git a/pyproject.toml b/pyproject.toml index 4d8f0d4..66208ea 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -61,7 +61,7 @@ minversion = "8.0" branch = true relative_files = true source = ["xcompact3d_toolbox", "tests"] -omit = ["xcompact3d_toolbox/_version.py"] +omit = ["xcompact3d_toolbox/_version.py", "**/__init__.py"] [tool.coverage.report] show_missing = true diff --git a/sonar-project.properties b/sonar-project.properties index e44a7f7..ac6fa92 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,4 +1,6 @@ sonar.organization=fschuch sonar.projectKey=fschuch_xcompact3d_toolbox - +sonar.python.version=3.8, 3.9, 3.10, 3.11, 3.12 +sonar.sources=xcompact3d_toolbox +sonar.tests=tests sonar.python.coverage.reportPaths=coverage.*.xml