From 21e476636bc25ce9dfe9a91e0c63cd1aa8952264 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 22 May 2024 07:39:33 +0100 Subject: [PATCH 1/7] allow-prereleases --- .github/workflows/python_checks.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/python_checks.yml b/.github/workflows/python_checks.yml index 31ca184..c39b5d0 100644 --- a/.github/workflows/python_checks.yml +++ b/.github/workflows/python_checks.yml @@ -144,6 +144,7 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + allow-prereleases: ${{ inputs.python-version == 3.13 }} - name: Checkout uses: actions/checkout@v4 From af70e51e25bf208fc00c112934b8d15135479c01 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 22 May 2024 07:46:06 +0100 Subject: [PATCH 2/7] allow-prereleases: ${{ matrix.python-version == 3.13 }} --- .github/workflows/python_checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python_checks.yml b/.github/workflows/python_checks.yml index c39b5d0..42634ef 100644 --- a/.github/workflows/python_checks.yml +++ b/.github/workflows/python_checks.yml @@ -144,7 +144,7 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - allow-prereleases: ${{ inputs.python-version == 3.13 }} + allow-prereleases: ${{ matrix.python-version == 3.13 }} - name: Checkout uses: actions/checkout@v4 From 23c82df20b658a51baaa3ff194cab493cb732c08 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 22 May 2024 07:56:19 +0100 Subject: [PATCH 3/7] SKIP_PING_TESTS --- .github/workflows/python_checks.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/python_checks.yml b/.github/workflows/python_checks.yml index 42634ef..70acd99 100644 --- a/.github/workflows/python_checks.yml +++ b/.github/workflows/python_checks.yml @@ -42,6 +42,7 @@ on: jobs: validate: + # Everything as checks but do validation steps first strategy: matrix: include: @@ -115,11 +116,16 @@ jobs: coverage: ${{ matrix.coverage == 'coverage' }} cover-packages: ${{ inputs.base-package }} coveralls-token: ${{ secrets.GITHUB_TOKEN }} + env: + # Tests using ping won't work in Github Actions because of system config + SKIP_PING_TESTS: true checks: + # Everything as tests but do validation steps first strategy: matrix: include: + # prereleases - runner: ubuntu-24.04 python-version: "3.13" @@ -191,6 +197,9 @@ jobs: coverage: ${{ matrix.coverage == 'coverage' }} cover-packages: ${{ inputs.base-package }} coveralls-token: ${{ secrets.GITHUB_TOKEN }} + env: + # Tests using ping won't work in Github Actions because of system config + SKIP_PING_TESTS: true tests: strategy: @@ -243,4 +252,6 @@ jobs: env: SPALLOC_USER: ${{ secrets.SPALLOC_USER }} SPALLOC_PASSWORD: ${{ secrets.SPALLOC_PASSWORD }} + # Tests using ping won't work in Github Actions because of system config + SKIP_PING_TESTS: true run: pytest ${{ inputs.test_directories }} From cc175bb15b6eb70355ea181739dc9420c869d12f Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 22 May 2024 09:11:14 +0100 Subject: [PATCH 4/7] SPALLOC_USER --- .github/workflows/python_checks.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python_checks.yml b/.github/workflows/python_checks.yml index 70acd99..4f434c2 100644 --- a/.github/workflows/python_checks.yml +++ b/.github/workflows/python_checks.yml @@ -117,6 +117,8 @@ jobs: cover-packages: ${{ inputs.base-package }} coveralls-token: ${{ secrets.GITHUB_TOKEN }} env: + SPALLOC_USER: ${{ secrets.SPALLOC_USER }} + SPALLOC_PASSWORD: ${{ secrets.SPALLOC_PASSWORD }} # Tests using ping won't work in Github Actions because of system config SKIP_PING_TESTS: true @@ -193,11 +195,13 @@ jobs: - name: Test with pytest uses: ./support/actions/pytest with: - tests: ${{ inputs.stest_directories }} + tests: ${{ inputs.test_directories }} coverage: ${{ matrix.coverage == 'coverage' }} cover-packages: ${{ inputs.base-package }} coveralls-token: ${{ secrets.GITHUB_TOKEN }} env: + SPALLOC_USER: ${{ secrets.SPALLOC_USER }} + SPALLOC_PASSWORD: ${{ secrets.SPALLOC_PASSWORD }} # Tests using ping won't work in Github Actions because of system config SKIP_PING_TESTS: true From 5cfed5147ea5b122c2d5faadb9bbabf61d21e34b Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Wed, 22 May 2024 09:41:23 +0100 Subject: [PATCH 5/7] increase timeout --- .github/workflows/python_checks.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python_checks.yml b/.github/workflows/python_checks.yml index 4f434c2..1053715 100644 --- a/.github/workflows/python_checks.yml +++ b/.github/workflows/python_checks.yml @@ -50,7 +50,7 @@ jobs: python-version: "3.12" checks: 'validate' runs-on: ${{ matrix.runner }} - timeout-minutes: 5 + timeout-minutes: 20 steps: - name: Set up Python ${{ matrix.python-version }} @@ -145,7 +145,7 @@ jobs: python-version: 3.8 runs-on: ${{ matrix.runner }} - timeout-minutes: 5 + timeout-minutes: 20 steps: - name: Set up Python ${{ matrix.python-version }} @@ -226,7 +226,7 @@ jobs: checks: 'tests' runs-on: ${{ matrix.runner }} - timeout-minutes: 5 + timeout-minutes: 20 steps: - name: Set up Python ${{ matrix.python-version }} From ed69f5392f0fe22e49a7a0ec16be6faac54f7e91 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 12:01:43 +0100 Subject: [PATCH 6/7] if: ${{ inputs.check_tools }} --- actions/python-tools/action.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/actions/python-tools/action.yml b/actions/python-tools/action.yml index a17c265..3b7fb1b 100644 --- a/actions/python-tools/action.yml +++ b/actions/python-tools/action.yml @@ -16,6 +16,10 @@ name: "Install Advanced Python Tools" description: > Installs tooling to support advanced Python testing. inputs: + check_tools: + description: Install the checking tools + required: false + default: true pylint-version: description: The version of pylint desired required: false @@ -39,6 +43,7 @@ runs: using: composite steps: - name: Install spell checker + if: ${{ inputs.check_tools }} shell: bash run: source $SUPPORT_DIR/setup-spell.bash env: @@ -51,6 +56,7 @@ runs: shell: bash run: python -m pip install pip - name: Install extended Python tooling + if: ${{ inputs.check_tools }} shell: bash run: | pip install flake8 "pylint $PYLINT_VERSION" pyenchant From c46b9e8ba50af353bbf669b2b46a2418f1d1022e Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 23 May 2024 12:14:13 +0100 Subject: [PATCH 7/7] check_tools install --- actions/python-tools/action.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/actions/python-tools/action.yml b/actions/python-tools/action.yml index 3b7fb1b..0438fdf 100644 --- a/actions/python-tools/action.yml +++ b/actions/python-tools/action.yml @@ -19,7 +19,7 @@ inputs: check_tools: description: Install the checking tools required: false - default: true + default: install pylint-version: description: The version of pylint desired required: false @@ -43,7 +43,7 @@ runs: using: composite steps: - name: Install spell checker - if: ${{ inputs.check_tools }} + if: ${{ inputs.check_tools == 'install' }} shell: bash run: source $SUPPORT_DIR/setup-spell.bash env: @@ -56,7 +56,7 @@ runs: shell: bash run: python -m pip install pip - name: Install extended Python tooling - if: ${{ inputs.check_tools }} + if: ${{ inputs.check_tools == 'install'}} shell: bash run: | pip install flake8 "pylint $PYLINT_VERSION" pyenchant