From 8e7e3f8510453f454f30a0c6c67f2a2950086250 Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Fri, 19 Jan 2024 12:34:08 +0100 Subject: [PATCH 01/32] Increase Poetry request timeout --- .github/workflows/ci.yaml | 3 +++ .github/workflows/publish.yaml | 2 ++ .github/workflows/release.yaml | 2 ++ 3 files changed, 7 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 322898711..4e311d043 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,6 +8,9 @@ on: - main workflow_dispatch: +env: + POETRY_REQUESTS_TIMEOUT: 120 + jobs: test: name: Test diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 9d43637d6..c42c27fe0 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -3,6 +3,8 @@ on: push: tags: - '*' +env: + POETRY_REQUESTS_TIMEOUT: 120 jobs: publish: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8c5467a7a..c1c72ab3e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -12,6 +12,8 @@ on: - patch - minor - major +env: + POETRY_REQUESTS_TIMEOUT: 120 jobs: create-github-release-push-tag: From 50d997e364bbfd3e123836454efdaef9729a5454 Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Fri, 19 Jan 2024 12:43:09 +0100 Subject: [PATCH 02/32] Update files --- .github/workflows/ci.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4e311d043..3c6618af2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -85,7 +85,9 @@ jobs: publish-snapshot-version: name: Publish snapshot to TestPyPI needs: [test] - uses: bakdata/ci-templates/.github/workflows/python-poetry-publish-snapshot.yaml@v1.25.0 + uses: bakdata/ci-templates/.github/workflows/python-poetry-publish-snapshot.yaml@1.40.2 + with: + poetry-version: "1.7.1" secrets: pypi-token: ${{ secrets.TEST_PYPI_TOKEN }} From 17d2e0c596437d61fb990f10d8217dcfd0464643 Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Fri, 19 Jan 2024 12:49:39 +0100 Subject: [PATCH 03/32] Update files --- .github/workflows/publish.yaml | 4 ++-- .github/workflows/release.yaml | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index c42c27fe0..72eff7c21 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -8,9 +8,9 @@ env: jobs: publish: - uses: bakdata/ci-templates/.github/workflows/python-poetry-publish-pypi.yaml@1.25.3 + uses: bakdata/ci-templates/.github/workflows/python-poetry-publish-pypi.yaml@1.40.2 with: publish-to-test: false - poetry-version: "1.5.1" + poetry-version: "1.7.1" secrets: pypi-token: "${{ secrets.PYPI_TOKEN }}" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c1c72ab3e..8c5467a7a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -12,8 +12,6 @@ on: - patch - minor - major -env: - POETRY_REQUESTS_TIMEOUT: 120 jobs: create-github-release-push-tag: From a60f397e7d5c8bb7890e4d24f3eecf09a0ad3cdb Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Tue, 23 Jan 2024 08:49:09 +0100 Subject: [PATCH 04/32] change ref to main --- .github/workflows/ci.yaml | 7 +------ .github/workflows/publish.yaml | 5 +---- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3c6618af2..4e7f72d68 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,9 +8,6 @@ on: - main workflow_dispatch: -env: - POETRY_REQUESTS_TIMEOUT: 120 - jobs: test: name: Test @@ -85,9 +82,7 @@ jobs: publish-snapshot-version: name: Publish snapshot to TestPyPI needs: [test] - uses: bakdata/ci-templates/.github/workflows/python-poetry-publish-snapshot.yaml@1.40.2 - with: - poetry-version: "1.7.1" + uses: bakdata/ci-templates/.github/workflows/python-poetry-publish-snapshot.yaml@main secrets: pypi-token: ${{ secrets.TEST_PYPI_TOKEN }} diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 72eff7c21..722d28be5 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -3,14 +3,11 @@ on: push: tags: - '*' -env: - POETRY_REQUESTS_TIMEOUT: 120 jobs: publish: - uses: bakdata/ci-templates/.github/workflows/python-poetry-publish-pypi.yaml@1.40.2 + uses: bakdata/ci-templates/.github/workflows/python-poetry-publish-pypi.yaml@main with: publish-to-test: false - poetry-version: "1.7.1" secrets: pypi-token: "${{ secrets.PYPI_TOKEN }}" From d46e44740a212b09bec33308ba5f439c5512558d Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 08:51:46 +0100 Subject: [PATCH 05/32] change ref --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4e7f72d68..7e3cca27a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -82,7 +82,7 @@ jobs: publish-snapshot-version: name: Publish snapshot to TestPyPI needs: [test] - uses: bakdata/ci-templates/.github/workflows/python-poetry-publish-snapshot.yaml@main + uses: bakdata/ci-templates/.github/workflows/python-poetry-publish-snapshot.yaml@test/python-poetry-snapshot secrets: pypi-token: ${{ secrets.TEST_PYPI_TOKEN }} From 5453d5f30c108c3591e2697f67f5b10a13f02baa Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 08:55:12 +0100 Subject: [PATCH 06/32] comment test --- .github/workflows/ci.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7e3cca27a..0b0829579 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -66,18 +66,18 @@ jobs: - name: Generate pipeline definitions run: poetry run pre-commit run gen-docs-components --all-files --show-diff-on-failure - - name: Test - run: poetry run pytest tests + # - name: Test + # run: poetry run pytest tests - - name: Install docs dependencies - run: poetry install --with docs + # - name: Install docs dependencies + # run: poetry install --with docs - - name: Check markdown, toml, css formatting - uses: dprint/check@v2.2 - if: runner.os == 'Linux' + # - name: Check markdown, toml, css formatting + # uses: dprint/check@v2.2 + # if: runner.os == 'Linux' - - name: Test docs build (mkdocs) - run: poetry run mkdocs build -f docs/mkdocs.yml + # - name: Test docs build (mkdocs) + # run: poetry run mkdocs build -f docs/mkdocs.yml publish-snapshot-version: name: Publish snapshot to TestPyPI From 887d983b92b5f900afdc371cb9cdbf3d985ba4af Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 08:59:04 +0100 Subject: [PATCH 07/32] change ref --- .github/workflows/ci.yaml | 52 +++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0b0829579..7faf6574a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -31,40 +31,40 @@ jobs: poetry-version: "1.4.1" # REASON: https://github.com/python-poetry/poetry/issues/8180 python-version: ${{ matrix.python-version }} - - name: Check Poetry lock file consistency - run: poetry lock --check + # - name: Check Poetry lock file consistency + # run: poetry lock --check - - name: Install dependencies - run: poetry install --no-interaction + # - name: Install dependencies + # run: poetry install --no-interaction - - name: Lint (ruff) - shell: bash - run: | - if [[ "$RUNNER_OS" == "Linux" && "${{ matrix.python-version }}" == "3.10" ]] - then - echo "::add-matcher::.github/ruff-matcher.json" - poetry run ruff check . --config pyproject.toml --output-format text --no-fix - else - poetry run pre-commit run ruff-lint --all-files --show-diff-on-failure - fi; + # - name: Lint (ruff) + # shell: bash + # run: | + # if [[ "$RUNNER_OS" == "Linux" && "${{ matrix.python-version }}" == "3.10" ]] + # then + # echo "::add-matcher::.github/ruff-matcher.json" + # poetry run ruff check . --config pyproject.toml --output-format text --no-fix + # else + # poetry run pre-commit run ruff-lint --all-files --show-diff-on-failure + # fi; - - name: Formatting (ruff) - run: poetry run pre-commit run ruff-format --all-files --show-diff-on-failure + # - name: Formatting (ruff) + # run: poetry run pre-commit run ruff-format --all-files --show-diff-on-failure - - name: Typing (pyright) - run: poetry run pre-commit run pyright --all-files + # - name: Typing (pyright) + # run: poetry run pre-commit run pyright --all-files - - name: Generate schema (kpops schema) - run: poetry run pre-commit run gen-schema --all-files --show-diff-on-failure + # - name: Generate schema (kpops schema) + # run: poetry run pre-commit run gen-schema --all-files --show-diff-on-failure - - name: Generate CLI Usage docs (typer-cli) - run: poetry run pre-commit run gen-docs-cli --all-files --show-diff-on-failure + # - name: Generate CLI Usage docs (typer-cli) + # run: poetry run pre-commit run gen-docs-cli --all-files --show-diff-on-failure - - name: Generate Environment variable docs - run: poetry run pre-commit run gen-docs-env-vars --all-files --show-diff-on-failure + # - name: Generate Environment variable docs + # run: poetry run pre-commit run gen-docs-env-vars --all-files --show-diff-on-failure - - name: Generate pipeline definitions - run: poetry run pre-commit run gen-docs-components --all-files --show-diff-on-failure + # - name: Generate pipeline definitions + # run: poetry run pre-commit run gen-docs-components --all-files --show-diff-on-failure # - name: Test # run: poetry run pytest tests From ccab60ffa9913a32f50aee248ed2c99d15acf7ac Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 08:59:14 +0100 Subject: [PATCH 08/32] remove windows --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7faf6574a..257b14d52 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,7 +16,7 @@ jobs: matrix: os: - ubuntu-22.04 - - windows-2022 + # - windows-2022 python-version: ["3.10", "3.11"] runs-on: ${{ matrix.os }} From 42fc6dbcec924d5d6299c4664e9d65d3810c9cc4 Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:01:38 +0100 Subject: [PATCH 09/32] add windows --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 257b14d52..7faf6574a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,7 +16,7 @@ jobs: matrix: os: - ubuntu-22.04 - # - windows-2022 + - windows-2022 python-version: ["3.10", "3.11"] runs-on: ${{ matrix.os }} From 1391cb91039c0ed3a6d3c3b5efa8d76259eb33ae Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:01:46 +0100 Subject: [PATCH 10/32] test --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7faf6574a..c270bebfe 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -31,8 +31,8 @@ jobs: poetry-version: "1.4.1" # REASON: https://github.com/python-poetry/poetry/issues/8180 python-version: ${{ matrix.python-version }} - # - name: Check Poetry lock file consistency - # run: poetry lock --check + - name: Check Poetry lock file consistency + run: poetry lock --check # - name: Install dependencies # run: poetry install --no-interaction From eb9ba945dccaec40ba4ef30987da053939d6deba Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:02:04 +0100 Subject: [PATCH 11/32] test --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c270bebfe..16c30d5d3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -21,7 +21,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true From 9f11c8a5e1cf63b098aea4378e2dbdc9641623a6 Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:02:29 +0100 Subject: [PATCH 12/32] test --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 16c30d5d3..3649c67df 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -31,8 +31,8 @@ jobs: poetry-version: "1.4.1" # REASON: https://github.com/python-poetry/poetry/issues/8180 python-version: ${{ matrix.python-version }} - - name: Check Poetry lock file consistency - run: poetry lock --check + # - name: Check Poetry lock file consistency + # run: poetry lock --check # - name: Install dependencies # run: poetry install --no-interaction From 0587ac8ffb931a987a048f7526500418c772a844 Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:02:52 +0100 Subject: [PATCH 13/32] test --- .github/workflows/ci.yaml | 70 +++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3649c67df..4c04d3cad 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -31,53 +31,53 @@ jobs: poetry-version: "1.4.1" # REASON: https://github.com/python-poetry/poetry/issues/8180 python-version: ${{ matrix.python-version }} - # - name: Check Poetry lock file consistency - # run: poetry lock --check + - name: Check Poetry lock file consistency + run: poetry lock --check - # - name: Install dependencies - # run: poetry install --no-interaction + - name: Install dependencies + run: poetry install --no-interaction - # - name: Lint (ruff) - # shell: bash - # run: | - # if [[ "$RUNNER_OS" == "Linux" && "${{ matrix.python-version }}" == "3.10" ]] - # then - # echo "::add-matcher::.github/ruff-matcher.json" - # poetry run ruff check . --config pyproject.toml --output-format text --no-fix - # else - # poetry run pre-commit run ruff-lint --all-files --show-diff-on-failure - # fi; + - name: Lint (ruff) + shell: bash + run: | + if [[ "$RUNNER_OS" == "Linux" && "${{ matrix.python-version }}" == "3.10" ]] + then + echo "::add-matcher::.github/ruff-matcher.json" + poetry run ruff check . --config pyproject.toml --output-format text --no-fix + else + poetry run pre-commit run ruff-lint --all-files --show-diff-on-failure + fi; - # - name: Formatting (ruff) - # run: poetry run pre-commit run ruff-format --all-files --show-diff-on-failure + - name: Formatting (ruff) + run: poetry run pre-commit run ruff-format --all-files --show-diff-on-failure - # - name: Typing (pyright) - # run: poetry run pre-commit run pyright --all-files + - name: Typing (pyright) + run: poetry run pre-commit run pyright --all-files - # - name: Generate schema (kpops schema) - # run: poetry run pre-commit run gen-schema --all-files --show-diff-on-failure + - name: Generate schema (kpops schema) + run: poetry run pre-commit run gen-schema --all-files --show-diff-on-failure - # - name: Generate CLI Usage docs (typer-cli) - # run: poetry run pre-commit run gen-docs-cli --all-files --show-diff-on-failure + - name: Generate CLI Usage docs (typer-cli) + run: poetry run pre-commit run gen-docs-cli --all-files --show-diff-on-failure - # - name: Generate Environment variable docs - # run: poetry run pre-commit run gen-docs-env-vars --all-files --show-diff-on-failure + - name: Generate Environment variable docs + run: poetry run pre-commit run gen-docs-env-vars --all-files --show-diff-on-failure - # - name: Generate pipeline definitions - # run: poetry run pre-commit run gen-docs-components --all-files --show-diff-on-failure + - name: Generate pipeline definitions + run: poetry run pre-commit run gen-docs-components --all-files --show-diff-on-failure - # - name: Test - # run: poetry run pytest tests + - name: Test + run: poetry run pytest tests - # - name: Install docs dependencies - # run: poetry install --with docs + - name: Install docs dependencies + run: poetry install --with docs - # - name: Check markdown, toml, css formatting - # uses: dprint/check@v2.2 - # if: runner.os == 'Linux' + - name: Check markdown, toml, css formatting + uses: dprint/check@v2.2 + if: runner.os == 'Linux' - # - name: Test docs build (mkdocs) - # run: poetry run mkdocs build -f docs/mkdocs.yml + - name: Test docs build (mkdocs) + run: poetry run mkdocs build -f docs/mkdocs.yml publish-snapshot-version: name: Publish snapshot to TestPyPI From 048f84a2bb706148befaa7bac090747245124a61 Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:03:07 +0100 Subject: [PATCH 14/32] test --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4c04d3cad..d270ce754 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,7 +16,7 @@ jobs: matrix: os: - ubuntu-22.04 - - windows-2022 + # - windows-2022 python-version: ["3.10", "3.11"] runs-on: ${{ matrix.os }} From a4af8c39f34d3dd0f6983f283485d53e37069280 Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:03:12 +0100 Subject: [PATCH 15/32] test --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d270ce754..4c04d3cad 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,7 +16,7 @@ jobs: matrix: os: - ubuntu-22.04 - # - windows-2022 + - windows-2022 python-version: ["3.10", "3.11"] runs-on: ${{ matrix.os }} From c04d8529e85b6f398b9b3ff2cbf23329bf294971 Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:03:24 +0100 Subject: [PATCH 16/32] test --- .github/workflows/ci.yaml | 70 +++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4c04d3cad..3649c67df 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -31,53 +31,53 @@ jobs: poetry-version: "1.4.1" # REASON: https://github.com/python-poetry/poetry/issues/8180 python-version: ${{ matrix.python-version }} - - name: Check Poetry lock file consistency - run: poetry lock --check + # - name: Check Poetry lock file consistency + # run: poetry lock --check - - name: Install dependencies - run: poetry install --no-interaction + # - name: Install dependencies + # run: poetry install --no-interaction - - name: Lint (ruff) - shell: bash - run: | - if [[ "$RUNNER_OS" == "Linux" && "${{ matrix.python-version }}" == "3.10" ]] - then - echo "::add-matcher::.github/ruff-matcher.json" - poetry run ruff check . --config pyproject.toml --output-format text --no-fix - else - poetry run pre-commit run ruff-lint --all-files --show-diff-on-failure - fi; + # - name: Lint (ruff) + # shell: bash + # run: | + # if [[ "$RUNNER_OS" == "Linux" && "${{ matrix.python-version }}" == "3.10" ]] + # then + # echo "::add-matcher::.github/ruff-matcher.json" + # poetry run ruff check . --config pyproject.toml --output-format text --no-fix + # else + # poetry run pre-commit run ruff-lint --all-files --show-diff-on-failure + # fi; - - name: Formatting (ruff) - run: poetry run pre-commit run ruff-format --all-files --show-diff-on-failure + # - name: Formatting (ruff) + # run: poetry run pre-commit run ruff-format --all-files --show-diff-on-failure - - name: Typing (pyright) - run: poetry run pre-commit run pyright --all-files + # - name: Typing (pyright) + # run: poetry run pre-commit run pyright --all-files - - name: Generate schema (kpops schema) - run: poetry run pre-commit run gen-schema --all-files --show-diff-on-failure + # - name: Generate schema (kpops schema) + # run: poetry run pre-commit run gen-schema --all-files --show-diff-on-failure - - name: Generate CLI Usage docs (typer-cli) - run: poetry run pre-commit run gen-docs-cli --all-files --show-diff-on-failure + # - name: Generate CLI Usage docs (typer-cli) + # run: poetry run pre-commit run gen-docs-cli --all-files --show-diff-on-failure - - name: Generate Environment variable docs - run: poetry run pre-commit run gen-docs-env-vars --all-files --show-diff-on-failure + # - name: Generate Environment variable docs + # run: poetry run pre-commit run gen-docs-env-vars --all-files --show-diff-on-failure - - name: Generate pipeline definitions - run: poetry run pre-commit run gen-docs-components --all-files --show-diff-on-failure + # - name: Generate pipeline definitions + # run: poetry run pre-commit run gen-docs-components --all-files --show-diff-on-failure - - name: Test - run: poetry run pytest tests + # - name: Test + # run: poetry run pytest tests - - name: Install docs dependencies - run: poetry install --with docs + # - name: Install docs dependencies + # run: poetry install --with docs - - name: Check markdown, toml, css formatting - uses: dprint/check@v2.2 - if: runner.os == 'Linux' + # - name: Check markdown, toml, css formatting + # uses: dprint/check@v2.2 + # if: runner.os == 'Linux' - - name: Test docs build (mkdocs) - run: poetry run mkdocs build -f docs/mkdocs.yml + # - name: Test docs build (mkdocs) + # run: poetry run mkdocs build -f docs/mkdocs.yml publish-snapshot-version: name: Publish snapshot to TestPyPI From eba264d15b6991a043d7319711da41e08949e1f7 Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:09:19 +0100 Subject: [PATCH 17/32] test --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3649c67df..28dd9f372 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,7 +16,7 @@ jobs: matrix: os: - ubuntu-22.04 - - windows-2022 + # - windows-2022 python-version: ["3.10", "3.11"] runs-on: ${{ matrix.os }} From 57d278385e20747a58bfa5896f3b5260a1050f2a Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:09:27 +0100 Subject: [PATCH 18/32] test --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 28dd9f372..97d3598ea 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -31,8 +31,8 @@ jobs: poetry-version: "1.4.1" # REASON: https://github.com/python-poetry/poetry/issues/8180 python-version: ${{ matrix.python-version }} - # - name: Check Poetry lock file consistency - # run: poetry lock --check + - name: Check Poetry lock file consistency + run: poetry lock --check # - name: Install dependencies # run: poetry install --no-interaction From 8200fb9144d99cb68a9e615706aa5217a918c2d7 Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:09:35 +0100 Subject: [PATCH 19/32] test --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 97d3598ea..28dd9f372 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -31,8 +31,8 @@ jobs: poetry-version: "1.4.1" # REASON: https://github.com/python-poetry/poetry/issues/8180 python-version: ${{ matrix.python-version }} - - name: Check Poetry lock file consistency - run: poetry lock --check + # - name: Check Poetry lock file consistency + # run: poetry lock --check # - name: Install dependencies # run: poetry install --no-interaction From 6c8c94476e06c7a0ed7c52b7485cf8f7325f0247 Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:09:49 +0100 Subject: [PATCH 20/32] test --- .github/workflows/ci.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 28dd9f372..a741c875b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -128,3 +128,5 @@ jobs: email: ${{ secrets.GH_EMAIL }} token: ${{ secrets.GH_TOKEN }} version: dev + + \ No newline at end of file From 87c32569bf331c706f3b51d5714695e3b09ee039 Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:09:58 +0100 Subject: [PATCH 21/32] test --- .github/workflows/ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a741c875b..175b89d4a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -129,4 +129,3 @@ jobs: token: ${{ secrets.GH_TOKEN }} version: dev - \ No newline at end of file From 0844766fe4a234c2b8f92980a4b482f8ecfde2aa Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:10:03 +0100 Subject: [PATCH 22/32] test --- .github/workflows/ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 175b89d4a..28dd9f372 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -128,4 +128,3 @@ jobs: email: ${{ secrets.GH_EMAIL }} token: ${{ secrets.GH_TOKEN }} version: dev - From 57377b8797be70f24fc9b8278f60cbe899f47648 Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:10:15 +0100 Subject: [PATCH 23/32] test --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 28dd9f372..3649c67df 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,7 +16,7 @@ jobs: matrix: os: - ubuntu-22.04 - # - windows-2022 + - windows-2022 python-version: ["3.10", "3.11"] runs-on: ${{ matrix.os }} From b94ac5a43e3c68e02f113e96d99550aede7aa11f Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:10:27 +0100 Subject: [PATCH 24/32] test --- .github/workflows/ci.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3649c67df..a500b39cb 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -128,3 +128,5 @@ jobs: email: ${{ secrets.GH_EMAIL }} token: ${{ secrets.GH_TOKEN }} version: dev + + \ No newline at end of file From 3436d2b6cc8631184de0e577c534541ccb7c69ae Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:10:34 +0100 Subject: [PATCH 25/32] test --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a500b39cb..a493eb264 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -129,4 +129,5 @@ jobs: token: ${{ secrets.GH_TOKEN }} version: dev + \ No newline at end of file From 3f00a12514d44df26ccbce3ebbba683dfb6336ba Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:10:42 +0100 Subject: [PATCH 26/32] test --- .github/workflows/ci.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a493eb264..ee9ca1a7e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -129,5 +129,3 @@ jobs: token: ${{ secrets.GH_TOKEN }} version: dev - - \ No newline at end of file From d2a4aeb8271b9fa2a9fa283939769a7a8c925f8d Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:10:49 +0100 Subject: [PATCH 27/32] test --- .github/workflows/ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ee9ca1a7e..3649c67df 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -128,4 +128,3 @@ jobs: email: ${{ secrets.GH_EMAIL }} token: ${{ secrets.GH_TOKEN }} version: dev - From a551c7b134764dd54da72dc6a3d93f04961f009c Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:14:42 +0100 Subject: [PATCH 28/32] revert comment --- .github/workflows/ci.yaml | 70 +++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3649c67df..4c04d3cad 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -31,53 +31,53 @@ jobs: poetry-version: "1.4.1" # REASON: https://github.com/python-poetry/poetry/issues/8180 python-version: ${{ matrix.python-version }} - # - name: Check Poetry lock file consistency - # run: poetry lock --check + - name: Check Poetry lock file consistency + run: poetry lock --check - # - name: Install dependencies - # run: poetry install --no-interaction + - name: Install dependencies + run: poetry install --no-interaction - # - name: Lint (ruff) - # shell: bash - # run: | - # if [[ "$RUNNER_OS" == "Linux" && "${{ matrix.python-version }}" == "3.10" ]] - # then - # echo "::add-matcher::.github/ruff-matcher.json" - # poetry run ruff check . --config pyproject.toml --output-format text --no-fix - # else - # poetry run pre-commit run ruff-lint --all-files --show-diff-on-failure - # fi; + - name: Lint (ruff) + shell: bash + run: | + if [[ "$RUNNER_OS" == "Linux" && "${{ matrix.python-version }}" == "3.10" ]] + then + echo "::add-matcher::.github/ruff-matcher.json" + poetry run ruff check . --config pyproject.toml --output-format text --no-fix + else + poetry run pre-commit run ruff-lint --all-files --show-diff-on-failure + fi; - # - name: Formatting (ruff) - # run: poetry run pre-commit run ruff-format --all-files --show-diff-on-failure + - name: Formatting (ruff) + run: poetry run pre-commit run ruff-format --all-files --show-diff-on-failure - # - name: Typing (pyright) - # run: poetry run pre-commit run pyright --all-files + - name: Typing (pyright) + run: poetry run pre-commit run pyright --all-files - # - name: Generate schema (kpops schema) - # run: poetry run pre-commit run gen-schema --all-files --show-diff-on-failure + - name: Generate schema (kpops schema) + run: poetry run pre-commit run gen-schema --all-files --show-diff-on-failure - # - name: Generate CLI Usage docs (typer-cli) - # run: poetry run pre-commit run gen-docs-cli --all-files --show-diff-on-failure + - name: Generate CLI Usage docs (typer-cli) + run: poetry run pre-commit run gen-docs-cli --all-files --show-diff-on-failure - # - name: Generate Environment variable docs - # run: poetry run pre-commit run gen-docs-env-vars --all-files --show-diff-on-failure + - name: Generate Environment variable docs + run: poetry run pre-commit run gen-docs-env-vars --all-files --show-diff-on-failure - # - name: Generate pipeline definitions - # run: poetry run pre-commit run gen-docs-components --all-files --show-diff-on-failure + - name: Generate pipeline definitions + run: poetry run pre-commit run gen-docs-components --all-files --show-diff-on-failure - # - name: Test - # run: poetry run pytest tests + - name: Test + run: poetry run pytest tests - # - name: Install docs dependencies - # run: poetry install --with docs + - name: Install docs dependencies + run: poetry install --with docs - # - name: Check markdown, toml, css formatting - # uses: dprint/check@v2.2 - # if: runner.os == 'Linux' + - name: Check markdown, toml, css formatting + uses: dprint/check@v2.2 + if: runner.os == 'Linux' - # - name: Test docs build (mkdocs) - # run: poetry run mkdocs build -f docs/mkdocs.yml + - name: Test docs build (mkdocs) + run: poetry run mkdocs build -f docs/mkdocs.yml publish-snapshot-version: name: Publish snapshot to TestPyPI From 8aa7c73ed4226a24f6ccf8bf415b2c6d828e1577 Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:37:57 +0100 Subject: [PATCH 29/32] update ci --- .github/workflows/ci.yaml | 6 +++--- .github/workflows/publish.yaml | 2 +- .github/workflows/release.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4c04d3cad..2a05769df 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -82,7 +82,7 @@ jobs: publish-snapshot-version: name: Publish snapshot to TestPyPI needs: [test] - uses: bakdata/ci-templates/.github/workflows/python-poetry-publish-snapshot.yaml@test/python-poetry-snapshot + uses: bakdata/ci-templates/.github/workflows/python-poetry-publish-snapshot.yaml@1.40.4 secrets: pypi-token: ${{ secrets.TEST_PYPI_TOKEN }} @@ -91,7 +91,7 @@ jobs: if: ${{ github.ref == 'refs/heads/main' }} needs: [test] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Publish docs from main branch uses: ./.github/actions/update-docs @@ -106,7 +106,7 @@ jobs: if: ${{ github.event_name == 'pull_request' }} needs: [test] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ github.head_ref }} diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 722d28be5..0ef3eba46 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -6,7 +6,7 @@ on: jobs: publish: - uses: bakdata/ci-templates/.github/workflows/python-poetry-publish-pypi.yaml@main + uses: bakdata/ci-templates/.github/workflows/python-poetry-publish-pypi.yaml@1.40.4 with: publish-to-test: false secrets: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8c5467a7a..af1faafee 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -15,7 +15,7 @@ on: jobs: create-github-release-push-tag: - uses: bakdata/ci-templates/.github/workflows/python-poetry-release.yaml@1.40.1 + uses: bakdata/ci-templates/.github/workflows/python-poetry-release.yaml@1.40.4 name: Release with: release-type: ${{ inputs.release-type }} @@ -33,7 +33,7 @@ jobs: needs: create-github-release-push-tag steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 # Fetch all tags; Required for doc versioning From 10ec47eb0e3fd4daf4652356b6b24d7fbf1dfdb4 Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 09:48:00 +0100 Subject: [PATCH 30/32] set poetry version --- .github/workflows/publish.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 0ef3eba46..52a4c022c 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -9,5 +9,6 @@ jobs: uses: bakdata/ci-templates/.github/workflows/python-poetry-publish-pypi.yaml@1.40.4 with: publish-to-test: false + poetry-version: "1.4.1" secrets: pypi-token: "${{ secrets.PYPI_TOKEN }}" From fe97678ae3fe176995030417fb9caa36a25748b5 Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 11:44:37 +0100 Subject: [PATCH 31/32] update poetry --- .github/workflows/ci.yaml | 4 +++- .github/workflows/publish.yaml | 2 +- .github/workflows/release.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2a05769df..9b8217753 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -28,7 +28,7 @@ jobs: - name: Install Python and set up Poetry uses: bakdata/ci-templates/actions/python-setup-poetry@v1.5.3 with: - poetry-version: "1.4.1" # REASON: https://github.com/python-poetry/poetry/issues/8180 + poetry-version: "1.7.1" # REASON: https://github.com/python-poetry/poetry/issues/8180 python-version: ${{ matrix.python-version }} - name: Check Poetry lock file consistency @@ -83,6 +83,8 @@ jobs: name: Publish snapshot to TestPyPI needs: [test] uses: bakdata/ci-templates/.github/workflows/python-poetry-publish-snapshot.yaml@1.40.4 + with: + poetry-version: "1.7.1" secrets: pypi-token: ${{ secrets.TEST_PYPI_TOKEN }} diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 52a4c022c..fd66ef0cd 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -9,6 +9,6 @@ jobs: uses: bakdata/ci-templates/.github/workflows/python-poetry-publish-pypi.yaml@1.40.4 with: publish-to-test: false - poetry-version: "1.4.1" + poetry-version: "1.7.1" secrets: pypi-token: "${{ secrets.PYPI_TOKEN }}" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index af1faafee..e4b23e3e8 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -19,7 +19,7 @@ jobs: name: Release with: release-type: ${{ inputs.release-type }} - poetry-version: "1.5.1" + poetry-version: "1.7.1" changelog: true changelog-config: "./.github/changelog-config.json" changelog-file: "./docs/docs/user/changelog.md" From 26e1aa28805f3ac5b1bcd6d73a4d07499c7cadbf Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Thu, 25 Jan 2024 11:51:15 +0100 Subject: [PATCH 32/32] remove comment --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9b8217753..7f5b48b3c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -28,7 +28,7 @@ jobs: - name: Install Python and set up Poetry uses: bakdata/ci-templates/actions/python-setup-poetry@v1.5.3 with: - poetry-version: "1.7.1" # REASON: https://github.com/python-poetry/poetry/issues/8180 + poetry-version: "1.7.1" python-version: ${{ matrix.python-version }} - name: Check Poetry lock file consistency