From a5b3e943f22194a8cb65109699ef706ab69a1e94 Mon Sep 17 00:00:00 2001 From: David Mulcahey Date: Sun, 16 Apr 2023 09:39:49 -0400 Subject: [PATCH 1/2] Updates to support pyproject.toml --- .github/workflows/ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 19cfcc8..b7b4405 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,7 @@ jobs: key: >- ${{ inputs.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{ steps.python.outputs.python-version }}-${{ - hashFiles('setup.py', 'requirements_test.txt') }} + hashFiles('setup.py', 'pyproject.toml') }} restore-keys: | ${{ inputs.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{ steps.python.outputs.python-version }}- - name: Create Python virtual environment @@ -64,8 +64,7 @@ jobs: python -m venv venv . venv/bin/activate pip install -U pip setuptools pre-commit - pip install -r requirements_test.txt - pip install -e . + pip install -e '.[testing]' pre-commit: name: Run pre-commit @@ -88,7 +87,7 @@ jobs: key: >- ${{ inputs.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{ steps.python.outputs.python-version }}-${{ - hashFiles('setup.py', 'requirements_test.txt') }} + hashFiles('setup.py', 'pyproject.toml') }} - name: Lint and static analysis uses: pre-commit/action@v3.0.0 @@ -117,7 +116,7 @@ jobs: key: >- ${{ inputs.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{ steps.python.outputs.python-version }}-${{ - hashFiles('setup.py', 'requirements_test.txt') }} + hashFiles('setup.py', 'pyproject.toml') }} - name: Register Python problem matcher run: | echo "::add-matcher::.github/workflows/matchers/python.json" @@ -166,7 +165,7 @@ jobs: key: >- ${{ inputs.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{ steps.python.outputs.python-version }}-${{ - hashFiles('setup.py', 'requirements_test.txt') }} + hashFiles('setup.py', 'pyproject.toml') }} - name: Download all coverage artifacts uses: actions/download-artifact@v3 - name: Combine coverage results From 75f000786e67d814e30315ffcfba53d42e236c75 Mon Sep 17 00:00:00 2001 From: David Mulcahey Date: Sun, 16 Apr 2023 09:42:57 -0400 Subject: [PATCH 2/2] cov config --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b7b4405..b8e4be2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -135,6 +135,7 @@ jobs: --timeout=20 \ --durations=10 \ --cov ${{ inputs.CODE_FOLDER }} \ + --cov-config pyproject.toml \ -o console_output_style=count \ -p no:sugar \ tests