From e8efb92ba0e82470ed43730f1b009ad314f55fb9 Mon Sep 17 00:00:00 2001 From: skjerns <14980558+skjerns@users.noreply.github.com> Date: Wed, 12 Mar 2025 11:44:25 +0100 Subject: [PATCH 1/2] remove duplicate test file --- .github/workflows/Tests.yml | 10 ++++------ .github/workflows/testing.yml | 37 ----------------------------------- 2 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 .github/workflows/testing.yml diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml index 3eb0868..21f7d21 100644 --- a/.github/workflows/Tests.yml +++ b/.github/workflows/Tests.yml @@ -1,13 +1,11 @@ # This workflow will install Python dependencies, run tests and lint with a variety of Python versions # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions -name: Python package +name: Run tests and linting on: push: - branches: [ master ] pull_request: - branches: [ master ] jobs: build: @@ -15,13 +13,13 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.7, 3.8, 3.9, 3.11] + python-version: [3.8, 3.9, 3.10, 3.11, 3.12] os: [ubuntu-latest, macos-latest, windows-latest] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml deleted file mode 100644 index a310d15..0000000 --- a/.github/workflows/testing.yml +++ /dev/null @@ -1,37 +0,0 @@ -# This workflow will install Python dependencies, run tests with Python versions 3.8 and 3.11 - -name: Testing - -on: - [push] - -jobs: - build: - - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: ["3.8", "3.11"] - - steps: - - uses: actions/checkout@v3 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install pytest coverage # flake8 - pip install -r test-requirements.txt - pip install -r requirements.txt - - name: Test with pytest - run: | - coverage run -m pytest - coverage report -m --skip-covered --include=./unisens/* --precision=2 - - name: Test with unittest - run: | - coverage run -m unittest discover -p '*_test.py' - coverage report -m --skip-covered --include=./unisens/* --precision=2 - From e156b9f798f384740781a18a8e316e4d058568d8 Mon Sep 17 00:00:00 2001 From: skjerns <14980558+skjerns@users.noreply.github.com> Date: Wed, 12 Mar 2025 11:45:18 +0100 Subject: [PATCH 2/2] switch to braces in python version number --- .github/workflows/Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml index 21f7d21..3284cf6 100644 --- a/.github/workflows/Tests.yml +++ b/.github/workflows/Tests.yml @@ -13,7 +13,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.8, 3.9, 3.10, 3.11, 3.12] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] os: [ubuntu-latest, macos-latest, windows-latest] steps: