From 1200f19ff2f7ac882e3f2062209383634449faa6 Mon Sep 17 00:00:00 2001 From: Elizabeth Campolongo <38985481+egrace479@users.noreply.github.com> Date: Tue, 30 Jul 2024 17:24:18 -0400 Subject: [PATCH 1/5] Update run-tests.yml Add new tests to testing workflow with pytest --- .github/workflows/run-tests.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 8336014..8f5d17e 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -20,6 +20,10 @@ jobs: run: pip install . shell: bash - - name: run test - run: python -m unittest + - name: install pytest + run: pip install pytest + shell: bash + + - name: run tests + run: pytest shell: bash From b33007c5948938fb0ac6c0e110606ac1c569aca8 Mon Sep 17 00:00:00 2001 From: Elizabeth Campolongo <38985481+egrace479@users.noreply.github.com> Date: Wed, 31 Jul 2024 13:26:02 -0400 Subject: [PATCH 2/5] Update pyproject.toml Add pytest as dev dependency --- pyproject.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 8022182..e5ee0d0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,6 +29,10 @@ dependencies = [ "pillow", "sum-buddy @ git+https://github.com/Imageomics/sum-buddy.git@v0.1.0-alpha", ] + +[project.optional-dependencies] +dev = ["pytest"] + keywords = [ "downloader", "csv", From f84bac615119b44193364a690a38d3ce7a2578de Mon Sep 17 00:00:00 2001 From: Elizabeth Campolongo <38985481+egrace479@users.noreply.github.com> Date: Wed, 31 Jul 2024 13:26:49 -0400 Subject: [PATCH 3/5] Update run-tests.yml use .[dev] install for test workflow --- .github/workflows/run-tests.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 8f5d17e..2977588 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -17,11 +17,7 @@ jobs: python-version: '3.11' - name: install dependencies - run: pip install . - shell: bash - - - name: install pytest - run: pip install pytest + run: pip install .[dev] shell: bash - name: run tests From 13de65186fc6490f03debe35d151c16fdfa75955 Mon Sep 17 00:00:00 2001 From: Elizabeth Campolongo <38985481+egrace479@users.noreply.github.com> Date: Wed, 31 Jul 2024 13:40:54 -0400 Subject: [PATCH 4/5] Update run-tests.yml Set to test all supported python versions with matrix setup --- .github/workflows/run-tests.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 2977588..49a6d71 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -7,14 +7,18 @@ on: jobs: run-tests: runs-on: ubuntu-latest + strategy: + matrix: + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] steps: - name: Checkout repository uses: actions/checkout@v4 - - uses: actions/setup-python@v5 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: ${{ matrix.python-version }} - name: install dependencies run: pip install .[dev] From 9d37c32fd485abc9532fb352a5c888cfe9cde1b9 Mon Sep 17 00:00:00 2001 From: egrace479 Date: Wed, 31 Jul 2024 17:38:24 -0400 Subject: [PATCH 5/5] Set up testing for PRs and pushes separately --- .../{run-tests.yml => run-pr-tests.yml} | 3 +- .github/workflows/run-push-tests.yml | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) rename .github/workflows/{run-tests.yml => run-pr-tests.yml} (93%) create mode 100644 .github/workflows/run-push-tests.yml diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-pr-tests.yml similarity index 93% rename from .github/workflows/run-tests.yml rename to .github/workflows/run-pr-tests.yml index 49a6d71..c5f5ff3 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-pr-tests.yml @@ -1,8 +1,9 @@ -name: run-tests +name: run-PR-tests on: pull_request: push: + branches: main jobs: run-tests: diff --git a/.github/workflows/run-push-tests.yml b/.github/workflows/run-push-tests.yml new file mode 100644 index 0000000..bd53d94 --- /dev/null +++ b/.github/workflows/run-push-tests.yml @@ -0,0 +1,28 @@ +name: run-push-tests + +on: + push: + +jobs: + run-tests: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: ["3.7", "3.12"] + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + + - name: install dependencies + run: pip install .[dev] + shell: bash + + - name: run tests + run: pytest + shell: bash