Commit f4d3df9e authored by Zebedee Nicholls's avatar Zebedee Nicholls
Browse files

Merge branch 'updates' into 'main' 

Make template CI more consistent with Makefile

See merge request !49
parents f2e08090 c474c0d7

changelog/49.improvement.md

0 → 100644
+1 −0
Changes for changelog/49.improvement.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line 
Added the `--doctest-report ndiff` argument to pytest calls in the template's CI (making them consistent with the `Makefile`)

template/{% if 'github' in project_url %}.github{% endif %}/workflows/ci.yaml.jinja

+1 −1
Changes for template/{% if 'github' in project_url %}.github{% endif %}/workflows/ci.yaml.jinja: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ jobs: 
      - name: Run tests

        run: |

{% if package_manager == "uv" %}

          uv run pytest -r a -v src tests --doctest-modules --cov=src --cov-report=term-missing --cov-report=xml

          uv run pytest -r a -v src tests --doctest-modules --doctest-report ndiff --cov=src --cov-report=term-missing --cov-report=xml

          uv run coverage report

{% else %}

{{ 0/0 }}{# Explode #}

template/{% if 'gitlab' in project_url %}.gitlab-ci.yml{% endif %}.jinja

+1 −1
Changes for template/{% if 'gitlab' in project_url %}.gitlab-ci.yml{% endif %}.jinja: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ test:urls: 
    # We don't have that right now, because we're not sure this pain point exists.

{% if package_manager == "uv" %}

    - uv sync --all-extras --group tests

    - uv run pytest -r a -v src tests --doctest-modules --cov=src --cov-report=term-missing --cov-report=xml

    - uv run pytest -r a -v src tests --doctest-modules --doctest-report ndiff --cov=src --cov-report=term-missing --cov-report=xml

{% else %}

{{ 0/0 }}{# Explode #}

{% endif %}

tests/regression/ctt/conda-release/.gitlab-ci.yml

+1 −1
Changes for tests/regression/ctt/conda-release/.gitlab-ci.yml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ test:urls: 
    # we should add a CI step that runs the tests without optional dependencies too.

    # We don't have that right now, because we're not sure this pain point exists.

    - uv sync --all-extras --group tests

    - uv run pytest -r a -v src tests --doctest-modules --cov=src --cov-report=term-missing --cov-report=xml

    - uv run pytest -r a -v src tests --doctest-modules --doctest-report ndiff --cov=src --cov-report=term-missing --cov-report=xml



# Test against all security and bugfix versions: https://devguide.python.org/versions/

test:python 3.9:pytest:

tests/regression/ctt/github-defaults/.github/workflows/ci.yaml

+1 −1
Changes for tests/regression/ctt/github-defaults/.github/workflows/ci.yaml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ jobs: 
          uv-dependency-install-flags: "--all-extras --group tests"

      - name: Run tests

        run: |

          uv run pytest -r a -v src tests --doctest-modules --cov=src --cov-report=term-missing --cov-report=xml

          uv run pytest -r a -v src tests --doctest-modules --doctest-report ndiff --cov=src --cov-report=term-missing --cov-report=xml

          uv run coverage report

      - name: Upload coverage reports to Codecov with GitHub Action

        uses: codecov/codecov-action@v4.2.0