From d2b6b8e0a1ae830e087b3ab3c13cdaa243fd2703 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Mon, 20 Jan 2025 22:33:14 -0500 Subject: [PATCH 1/5] ci: set python-version 3.13 in test on pr --- .github/workflows/tests-on-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests-on-pr.yml b/.github/workflows/tests-on-pr.yml index dfdbc77..eb5828c 100644 --- a/.github/workflows/tests-on-pr.yml +++ b/.github/workflows/tests-on-pr.yml @@ -26,7 +26,7 @@ jobs: auto-update-conda: true environment-file: environment.yml auto-activate-base: false - python-version: 3.12 + python-version: 3.13 - name: Conda config run: >- From f79b1e9b2893cec3d37753cf7d16072ebae39b0d Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Mon, 20 Jan 2025 22:40:53 -0500 Subject: [PATCH 2/5] ci: run matrix on PR for testing --- .github/workflows/matrix-and-codecov-on-merge-to-main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml index ea2983b..fbfe039 100644 --- a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml +++ b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml @@ -1,6 +1,7 @@ name: CI on: + pull_request: push: branches: - main From 640c1b10d86f89968c6b7747dde296f00b25ecab Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Mon, 20 Jan 2025 22:59:57 -0500 Subject: [PATCH 3/5] ci: setup tests-on-pr reusable workflow --- .github/workflows/tests-on-pr.yml | 39 ++++++------------------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/.github/workflows/tests-on-pr.yml b/.github/workflows/tests-on-pr.yml index eb5828c..272377e 100644 --- a/.github/workflows/tests-on-pr.yml +++ b/.github/workflows/tests-on-pr.yml @@ -4,40 +4,15 @@ on: push: branches: - main - - cookie pull_request: workflow_dispatch: jobs: validate: - defaults: - run: - shell: bash -l {0} - - runs-on: ubuntu-latest - steps: - - name: Check out diffpy.srreal - uses: actions/checkout@v4 - - - name: Initialize miniconda - uses: conda-incubator/setup-miniconda@v3 - with: - activate-environment: test - auto-update-conda: true - environment-file: environment.yml - auto-activate-base: false - python-version: 3.13 - - - name: Conda config - run: >- - conda config --set always_yes yes - --set changeps1 no - - - name: Install diffpy.srreal and requirements - run: | - conda install --file requirements/test.txt - conda install boost numpy libdiffpy setuptools diffpy.structure periodictable gsl - python -m pip install . --no-deps - - - name: Validate diffpy.pdfgui - run: pytest tests + uses: Billingegroup/release-scripts/.github/workflows/_tests-on-pr.yml@v0 + with: + project: diffpy.srreal + c_extension: true + headless: false + secrets: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} From ca47ef8301d33d782488d5217e9b465d3f6a7ad5 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Mon, 20 Jan 2025 23:02:18 -0500 Subject: [PATCH 4/5] chore: add news for py3.13 support --- news/workflow-reuse.rst | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 news/workflow-reuse.rst diff --git a/news/workflow-reuse.rst b/news/workflow-reuse.rst new file mode 100644 index 0000000..11bc75e --- /dev/null +++ b/news/workflow-reuse.rst @@ -0,0 +1,23 @@ +**Added:** + +* Set up for GitHub reuseable workflows with Python 3.13 support. + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* + +**Security:** + +* From a1873542fa9ff2f694d1321d03a86da84d6764ec Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Mon, 20 Jan 2025 23:03:24 -0500 Subject: [PATCH 5/5] chore: fix spelling by pre-commit --- news/workflow-reuse.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/workflow-reuse.rst b/news/workflow-reuse.rst index 11bc75e..86d70ae 100644 --- a/news/workflow-reuse.rst +++ b/news/workflow-reuse.rst @@ -1,6 +1,6 @@ **Added:** -* Set up for GitHub reuseable workflows with Python 3.13 support. +* Set up GitHub reusable workflows with Python 3.13 support. **Changed:**