From 5ec42769ace6c17c890b4bbc83275108d29a4aba Mon Sep 17 00:00:00 2001 From: Steve Goldman <32876747+s-goldman@users.noreply.github.com> Date: Wed, 21 Aug 2024 10:38:24 -0400 Subject: [PATCH 1/8] Added CRON job, removed python 3.9 from testing. --- .github/workflows/ci.yml | 6 +-- .github/workflows/cron.yml | 76 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/cron.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c83850c..4c3b096 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,10 +21,10 @@ jobs: python-version: '3.10' toxenv: py310 - - name: Python 3.9 + - name: Python 3.11 runs-on: ubuntu-latest - python-version: 3.9 - toxenv: py39 + python-version: 3.11 + toxenv: py312 - name: Python 3.12 runs-on: ubuntu-latest diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml new file mode 100644 index 0000000..90a0ef3 --- /dev/null +++ b/.github/workflows/cron.yml @@ -0,0 +1,76 @@ +name: CI + +on: + schedule: + # Weekly Monday 6AM build + - cron: "0 0 * * 1" + +jobs: + tox: + name: ${{ matrix.name }} + runs-on: ${{ matrix.runs-on }} + strategy: + fail-fast: false + matrix: + include: + - name: Python 3.10 + runs-on: ubuntu-latest + python-version: '3.10' + toxenv: py310 + + - name: Python 3.11 + runs-on: ubuntu-latest + python-version: 3.11 + toxenv: py312 + + - name: Python 3.12 + runs-on: ubuntu-latest + python-version: 3.12 + toxenv: py312 + + - name: Code style checks + runs-on: ubuntu-latest + python-version: 3.11 + toxenv: style + + - name: Python 3.11 with dev dependencies + runs-on: ubuntu-latest + python-version: 3.11 + toxenv: dev + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install tox + run: | + python -m pip install --upgrade pip + pip install tox + - name: Run tox + run: tox -e ${{ matrix.toxenv }} + + # Kept in a separate job because it needs extra system dependencies + # that can't be installed by tox. + build-docs: + name: Build documentation and check warnings + runs-on: ubuntu-latest + steps: + - name: Install system packages + run: | + sudo apt-get install graphviz texlive-latex-extra dvipng + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Set up Python 3.11 + uses: actions/setup-python@v2 + with: + python-version: 3.11 + - name: Install tox + run: | + python -m pip install --upgrade pip + pip install tox + - name: Run tox + run: tox -e build-docs From 6f006acfa6c7950de03a6decd3783f1003fc08bd Mon Sep 17 00:00:00 2001 From: Steve Goldman <32876747+s-goldman@users.noreply.github.com> Date: Wed, 21 Aug 2024 10:42:13 -0400 Subject: [PATCH 2/8] Added PR template --- .github/pull_request_template.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..b6e7bc2 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,17 @@ + +Resolves [HLA-nnnn](https://jira.stsci.edu/browse/HLA-nnnn) + + +Closes # + + +This PR addresses ... + +**Checklist for maintainers** +- [ ] added entry in `CHANGELOG.rst` within the relevant release section +- [ ] updated or added relevant tests +- [ ] updated relevant documentation +- [ ] added relevant label(s) +- [ ] ran regression tests, post a link to the Jenkins job below. + [How to run regression tests on a PR](https://github.com/spacetelescope/jwst/wiki/Running-Regression-Tests-Against-PR-Branches) From b42b3cd7db0f0cd5ab2df8b50d0b7bc32aca6115 Mon Sep 17 00:00:00 2001 From: Steve Goldman <32876747+s-goldman@users.noreply.github.com> Date: Wed, 21 Aug 2024 10:45:40 -0400 Subject: [PATCH 3/8] Removed jenkins test check for PR template. --- .github/pull_request_template.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index b6e7bc2..2a55df6 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -12,6 +12,4 @@ This PR addresses ... - [ ] added entry in `CHANGELOG.rst` within the relevant release section - [ ] updated or added relevant tests - [ ] updated relevant documentation -- [ ] added relevant label(s) -- [ ] ran regression tests, post a link to the Jenkins job below. - [How to run regression tests on a PR](https://github.com/spacetelescope/jwst/wiki/Running-Regression-Tests-Against-PR-Branches) +- [ ] added relevant label(s) \ No newline at end of file From cce755ce1b73f2b6e3ccf452030cc1e76e78500b Mon Sep 17 00:00:00 2001 From: Steve Goldman <32876747+s-goldman@users.noreply.github.com> Date: Wed, 21 Aug 2024 10:49:05 -0400 Subject: [PATCH 4/8] renamed cron. --- .github/workflows/{cron.yml => weekly_cron.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{cron.yml => weekly_cron.yml} (100%) diff --git a/.github/workflows/cron.yml b/.github/workflows/weekly_cron.yml similarity index 100% rename from .github/workflows/cron.yml rename to .github/workflows/weekly_cron.yml From 72c35e680c949569aff5c931c7fa02bf2474dab8 Mon Sep 17 00:00:00 2001 From: Steve Goldman <32876747+s-goldman@users.noreply.github.com> Date: Wed, 21 Aug 2024 10:54:04 -0400 Subject: [PATCH 5/8] bug in cron.yml --- .github/workflows/cron.yml | 76 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 .github/workflows/cron.yml diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml new file mode 100644 index 0000000..72ee5e1 --- /dev/null +++ b/.github/workflows/cron.yml @@ -0,0 +1,76 @@ +name: CI + +on: + schedule: + # Weekly Monday 6AM build + - cron: "0 0 * * 1" + +jobs: + tox: + name: ${{ matrix.name }} + runs-on: ${{ matrix.runs-on }} + strategy: + fail-fast: false + matrix: + include: + - name: Python 3.10 + runs-on: ubuntu-latest + python-version: '3.10' + toxenv: py310 + + - name: Python 3.11 + runs-on: ubuntu-latest + python-version: 3.11 + toxenv: py311 + + - name: Python 3.12 + runs-on: ubuntu-latest + python-version: 3.12 + toxenv: py312 + + - name: Code style checks + runs-on: ubuntu-latest + python-version: 3.11 + toxenv: style + + - name: Python 3.11 with dev dependencies + runs-on: ubuntu-latest + python-version: 3.11 + toxenv: dev + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install tox + run: | + python -m pip install --upgrade pip + pip install tox + - name: Run tox + run: tox -e ${{ matrix.toxenv }} + + # Kept in a separate job because it needs extra system dependencies + # that can't be installed by tox. + build-docs: + name: Build documentation and check warnings + runs-on: ubuntu-latest + steps: + - name: Install system packages + run: | + sudo apt-get install graphviz texlive-latex-extra dvipng + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Set up Python 3.11 + uses: actions/setup-python@v2 + with: + python-version: 3.11 + - name: Install tox + run: | + python -m pip install --upgrade pip + pip install tox + - name: Run tox + run: tox -e build-docs From 07d4c4a54309b757229fd9198e81ebf21e7fe42b Mon Sep 17 00:00:00 2001 From: Steve Goldman <32876747+s-goldman@users.noreply.github.com> Date: Wed, 21 Aug 2024 10:56:26 -0400 Subject: [PATCH 6/8] bug fix in tox. --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index e151a5f..cb6f59e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist= py311, py312, py310, style, dev +envlist= py310, py311, py312, style, dev [testenv] From cfac0d572ba9b1b521b7f2704a0d119a26cfae7c Mon Sep 17 00:00:00 2001 From: Steve Goldman <32876747+s-goldman@users.noreply.github.com> Date: Wed, 21 Aug 2024 10:58:22 -0400 Subject: [PATCH 7/8] bug in ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c3b096..1c11575 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: Python 3.11 runs-on: ubuntu-latest python-version: 3.11 - toxenv: py312 + toxenv: py311 - name: Python 3.12 runs-on: ubuntu-latest From 2ed2ea411beff9ab35958c606d0f9b24e563a56e Mon Sep 17 00:00:00 2001 From: Steve Goldman <32876747+s-goldman@users.noreply.github.com> Date: Wed, 21 Aug 2024 11:05:13 -0400 Subject: [PATCH 8/8] remove duplicate cron job. --- .github/workflows/cron.yml | 76 -------------------------------------- 1 file changed, 76 deletions(-) delete mode 100644 .github/workflows/cron.yml diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml deleted file mode 100644 index 72ee5e1..0000000 --- a/.github/workflows/cron.yml +++ /dev/null @@ -1,76 +0,0 @@ -name: CI - -on: - schedule: - # Weekly Monday 6AM build - - cron: "0 0 * * 1" - -jobs: - tox: - name: ${{ matrix.name }} - runs-on: ${{ matrix.runs-on }} - strategy: - fail-fast: false - matrix: - include: - - name: Python 3.10 - runs-on: ubuntu-latest - python-version: '3.10' - toxenv: py310 - - - name: Python 3.11 - runs-on: ubuntu-latest - python-version: 3.11 - toxenv: py311 - - - name: Python 3.12 - runs-on: ubuntu-latest - python-version: 3.12 - toxenv: py312 - - - name: Code style checks - runs-on: ubuntu-latest - python-version: 3.11 - toxenv: style - - - name: Python 3.11 with dev dependencies - runs-on: ubuntu-latest - python-version: 3.11 - toxenv: dev - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - name: Install tox - run: | - python -m pip install --upgrade pip - pip install tox - - name: Run tox - run: tox -e ${{ matrix.toxenv }} - - # Kept in a separate job because it needs extra system dependencies - # that can't be installed by tox. - build-docs: - name: Build documentation and check warnings - runs-on: ubuntu-latest - steps: - - name: Install system packages - run: | - sudo apt-get install graphviz texlive-latex-extra dvipng - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Set up Python 3.11 - uses: actions/setup-python@v2 - with: - python-version: 3.11 - - name: Install tox - run: | - python -m pip install --upgrade pip - pip install tox - - name: Run tox - run: tox -e build-docs