From 5da8994ce4b7aa8ef36617a6bfa7f8d7f6bb5199 Mon Sep 17 00:00:00 2001 From: Matthew Richards Date: Mon, 25 Oct 2021 12:28:58 +0000 Subject: [PATCH 1/2] Use Python 3.9 on CI jobs --- .github/workflows/ci-build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 7a1db0b7..72efcc9c 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -97,7 +97,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: '3.6' + python-version: '3.9' architecture: x64 - name: Checkout DataGateway API uses: actions/checkout@v2 @@ -117,7 +117,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: '3.6' + python-version: '3.9' architecture: x64 - name: Checkout DataGateway API uses: actions/checkout@v2 @@ -137,7 +137,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: '3.6' + python-version: '3.9' architecture: x64 - name: Checkout DataGateway API uses: actions/checkout@v2 @@ -167,7 +167,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: '3.x' + python-version: '3.9' architecture: x64 # ICAT Ansible clone and install dependencies From 42c29bef80ebec2584983603e629584ff21e601f Mon Sep 17 00:00:00 2001 From: Matthew Richards Date: Mon, 25 Oct 2021 12:30:54 +0000 Subject: [PATCH 2/2] Fix spacing in 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 1dc144a3..1e365c2d 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -8,9 +8,7 @@ Add a set up instructions describing how the reviewer should test the code - [ ] Review code - [ ] Check GitHub Actions build -- [ ] If `icatdb Generator Script Consistency Test` CI job fails, is this because of a - deliberate change made to the script to change generated data (which isn't - actually a problem) or is there an underlying issue with the changes made? +- [ ] If `icatdb Generator Script Consistency Test` CI job fails, is this because of a deliberate change made to the script to change generated data (which isn't actually a problem) or is here an underlying issue with the changes made? - [ ] Review changes to test coverage - [ ] {more steps here}