From 26a5e11a168138185c515f887b2fbd0dc316aef7 Mon Sep 17 00:00:00 2001 From: Bas des Tombe Date: Mon, 25 Nov 2024 10:46:11 -0600 Subject: [PATCH 1/3] Update lint workflow to improve concurrency handling and Hatch setup --- .github/workflows/lint.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index fbebe2c..b5ce308 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -13,8 +13,7 @@ jobs: name: Lint python files, repository.yaml, and mockup folder structure runs-on: ubuntu-latest concurrency: - # Cancel any previous runs with the same workflow name and branch - group: ${{ github.workflow }}-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} cancel-in-progress: true strategy: fail-fast: false @@ -25,10 +24,11 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.11" - check-latest: true + python-version-file: "pyproject.toml" + - name: Install uv + uses: astral-sh/setup-uv@v3 - name: Install hatch - run: python -m pip install pipx && pipx install hatch + run: uv tool install hatch - name: Lint Python files run: hatch run lintformat:lint - name: Lint repository.yaml and check mockup folder structure From e514a97c183ee9022dbefe37433c529278883626 Mon Sep 17 00:00:00 2001 From: Bas des Tombe Date: Mon, 25 Nov 2024 11:07:16 -0600 Subject: [PATCH 2/3] Update Python requirement to 3.11 in pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e266b8d..7537e06 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ license = { file = "LICENSE.txt" } maintainers = [{ name = "Bas des Tombe", email = "bas.des.tombe@pwn.nl" }] name = "nhflodata" readme = "README.md" -requires-python = ">=3.9" +requires-python = "3.11" version = "1.1.0" dependencies = ["pyyaml>=6.0.1"] From 2a5504630b0537b63145d27bc9043e02fa27b5d1 Mon Sep 17 00:00:00 2001 From: Bas des Tombe Date: Mon, 25 Nov 2024 11:35:38 -0600 Subject: [PATCH 3/3] Specify exact Python requirement version as 3.11 in pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7537e06..8e623a9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ license = { file = "LICENSE.txt" } maintainers = [{ name = "Bas des Tombe", email = "bas.des.tombe@pwn.nl" }] name = "nhflodata" readme = "README.md" -requires-python = "3.11" +requires-python = "==3.11" version = "1.1.0" dependencies = ["pyyaml>=6.0.1"]