From ec3c9932cd54323db1dde3cdb74592bd58194c0b Mon Sep 17 00:00:00 2001 From: Pey Lian Lim <2090236+pllim@users.noreply.github.com> Date: Tue, 11 Jun 2024 10:47:22 +0200 Subject: [PATCH 1/6] EXP: Test coverage without codecov --- .github/workflows/ci_workflows.yml | 17 ++--------------- tox.ini | 6 +----- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index fe8202e..9a94c88 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -35,26 +35,13 @@ jobs: tests: needs: initial_checks - uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1 + uses: zacharyburnett/github-actions-workflows/.github/workflows/tox.yml@tox/coverage_github_actions with: setenv: | jref: "https://ssb.stsci.edu/trds_open/jref" submodules: false - coverage: '' + coverage: github envs: | - - name: Lint with flake8 - linux: codestyle - - # Make sure that packaging will work - - name: pep517 build - linux: twine - - - name: Security audit - linux: bandit - - - name: Check links - linux: linkcheck - - name: Python 3.9 with remote data and all dependencies linux: py39-test-alldeps posargs: --remote-data -v diff --git a/tox.ini b/tox.ini index a4ba3b4..8498219 100644 --- a/tox.ini +++ b/tox.ini @@ -49,12 +49,8 @@ extras = predeps: all commands = - # Force numpy-dev after matplotlib downgrades it (https://github.com/matplotlib/matplotlib/issues/26847) - devdeps: python -m pip install --pre --upgrade --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy - # photutils has C-extension and must be built with numpy-dev in devdeps - devdeps: python -m pip install --pre --upgrade git+https://github.com/astropy/photutils.git pip freeze - pytest --pyargs acstools {toxinidir}/doc {posargs} + pytest --pyargs acstools --cov-report=xml --cov=acstools {toxinidir}/doc {posargs} pip_pre = predeps: true From 629868738fef3aa83ca34b7e28f3dcfa3e884637 Mon Sep 17 00:00:00 2001 From: Pey Lian Lim <2090236+pllim@users.noreply.github.com> Date: Tue, 11 Jun 2024 10:59:15 +0200 Subject: [PATCH 2/6] We need pytest-cov --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index 25dd769..4f4d478 100644 --- a/setup.cfg +++ b/setup.cfg @@ -48,6 +48,7 @@ all = dask test = pytest + pytest-cov pytest-astropy-header pytest-remotedata ci-watson From b4546f90eb30d21decde3170f8686dc799a8252e Mon Sep 17 00:00:00 2001 From: Pey Lian Lim <2090236+pllim@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:41:47 +0200 Subject: [PATCH 3/6] Still need photutils from source for devdeps --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index 8498219..22e8940 100644 --- a/tox.ini +++ b/tox.ini @@ -49,6 +49,8 @@ extras = predeps: all commands = + # photutils has C-extension and must be built with numpy-dev in devdeps + devdeps: python -m pip install --pre --upgrade git+https://github.com/astropy/photutils.git pip freeze pytest --pyargs acstools --cov-report=xml --cov=acstools {toxinidir}/doc {posargs} From 14149e34183583da5e88e5a57adeef019242185b Mon Sep 17 00:00:00 2001 From: Pey Lian Lim <2090236+pllim@users.noreply.github.com> Date: Wed, 12 Jun 2024 12:48:57 +0200 Subject: [PATCH 4/6] Switch branch --- .github/workflows/ci_workflows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index 9a94c88..2021d64 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -35,7 +35,7 @@ jobs: tests: needs: initial_checks - uses: zacharyburnett/github-actions-workflows/.github/workflows/tox.yml@tox/coverage_github_actions + uses: pllim/github-actions-workflows/.github/workflows/tox.yml@tst-oa-pr207 with: setenv: | jref: "https://ssb.stsci.edu/trds_open/jref" @@ -44,8 +44,8 @@ jobs: envs: | - name: Python 3.9 with remote data and all dependencies linux: py39-test-alldeps - posargs: --remote-data -v + posargs: -v - name: Python 3.12 with remote data and dev dependencies linux: py312-test-devdeps - posargs: --remote-data -v + posargs: -v From 27341cd8f9cdf632776709348f56472b5e2c8b9f Mon Sep 17 00:00:00 2001 From: Pey Lian Lim <2090236+pllim@users.noreply.github.com> Date: Wed, 12 Jun 2024 14:57:31 +0200 Subject: [PATCH 5/6] ooops wrong branch name --- .github/workflows/ci_workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index 2021d64..83d373c 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -35,7 +35,7 @@ jobs: tests: needs: initial_checks - uses: pllim/github-actions-workflows/.github/workflows/tox.yml@tst-oa-pr207 + uses: pllim/github-actions-workflows/.github/workflows/tox.yml@pr-to-pr207 with: setenv: | jref: "https://ssb.stsci.edu/trds_open/jref" From 61d3aacc9bb289d77cfa645e8e23da0a787142ea Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> Date: Tue, 25 Jun 2024 17:34:26 -0400 Subject: [PATCH 6/6] Change back to Zach PR branch --- .github/workflows/ci_workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index 83d373c..5480185 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -35,7 +35,7 @@ jobs: tests: needs: initial_checks - uses: pllim/github-actions-workflows/.github/workflows/tox.yml@pr-to-pr207 + uses: zacharyburnett/github-actions-workflows/.github/workflows/tox.yml@tox/coverage_github_actions with: setenv: | jref: "https://ssb.stsci.edu/trds_open/jref"