From 9d7c117ef44c251588b493070df071320088a5b1 Mon Sep 17 00:00:00 2001 From: staticdev Date: Thu, 15 Dec 2022 21:21:18 +0100 Subject: [PATCH 1/4] General CI improvements --- .github/labels.yml | 5 ++++- .github/release-drafter.yml | 11 ++++++++--- .github/workflows/integration.yml | 7 +++++-- .github/workflows/labeler.yml | 3 ++- .github/workflows/lint.yml | 5 ++++- .github/workflows/release.yml | 4 ++-- .github/workflows/test.yml | 10 +++++----- 7 files changed, 30 insertions(+), 15 deletions(-) diff --git a/.github/labels.yml b/.github/labels.yml index 263c4d3f2..f5bf73f1f 100644 --- a/.github/labels.yml +++ b/.github/labels.yml @@ -53,7 +53,7 @@ description: Refactoring color: "ef67c4" - name: removal - description: Removals and Deprecations + description: Removals and deprecations color: "9ae7ea" - name: style description: Style @@ -64,3 +64,6 @@ - name: wontfix description: This will not be worked on color: "ffffff" +- name: skip-changelog + description: This will not be added to release notes + color: "dddddd" diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 0fa65d396..ac1018add 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,3 +1,9 @@ +--- +template: | + ## Changes + + $CHANGES + categories: - title: ":boom: Breaking Changes" label: "breaking" @@ -25,7 +31,6 @@ categories: labels: - "dependencies" - "build" -template: | - ## Changes - $CHANGES +exclude-labels: + - "skip-changelog" diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index f26a0c9f0..8f8f73523 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -1,6 +1,9 @@ +--- name: Integration -on: [push, pull_request] +"on": + push: + pull_request: permissions: contents: read @@ -10,7 +13,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.9"] + python-version: ["3.11"] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index ae157d924..0d55db3ef 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -1,6 +1,7 @@ +--- name: Labeler -on: +"on": push: branches: - main diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index def6e4db5..ca9fda6a7 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,6 +1,9 @@ +--- name: Lint -on: [push, pull_request] +"on": + push: + pull_request: permissions: contents: read diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 62000862a..80297c593 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,7 @@ --- name: Release -on: +"on": push: branches: - main @@ -34,7 +34,7 @@ jobs: - name: Check if there is a parent commit id: check-parent-commit run: | - echo "::set-output name=sha::$(git rev-parse --verify --quiet HEAD^)" + echo "name=sha::$(git rev-parse --verify --quiet HEAD^)" >> $GITHUB_ENV - name: Detect and tag new version id: check-version diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b9f63c8be..46b015845 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,9 @@ +--- name: Test -on: [push, pull_request] +"on": + push: + pull_request: permissions: contents: read @@ -58,11 +61,8 @@ jobs: - name: Install Poetry run: | - python -m pip install --upgrade pip pipx install --pip-args=--constraint=.github/workflows/constraints.txt poetry - python -m pip install --upgrade poetry poetry --version - poetry install - name: Install dependencies run: poetry install @@ -72,5 +72,5 @@ jobs: run: ./scripts/test.sh - name: Report Coverage - if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.8' + if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11' uses: codecov/codecov-action@v1 From fcfb19fe286fbeb48763edbede557c7c37604fa6 Mon Sep 17 00:00:00 2001 From: staticdev Date: Thu, 15 Dec 2022 21:25:35 +0100 Subject: [PATCH 2/4] Rollback poetry version --- .github/workflows/constraints.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/constraints.txt b/.github/workflows/constraints.txt index a2e3178c5..983dcc171 100644 --- a/.github/workflows/constraints.txt +++ b/.github/workflows/constraints.txt @@ -1,3 +1,3 @@ pip==22.3.1 -poetry==1.3.1 +poetry==1.3.0 virtualenv==20.17.1 From 79d089faba5450a637ee351fc54b2eec2713f158 Mon Sep 17 00:00:00 2001 From: staticdev Date: Thu, 15 Dec 2022 21:31:02 +0100 Subject: [PATCH 3/4] Relock poetry --- poetry.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/poetry.lock b/poetry.lock index d8797f92f..c73d49fe7 100644 --- a/poetry.lock +++ b/poetry.lock @@ -676,14 +676,14 @@ libcst = ">=0.3.8" [[package]] name = "identify" -version = "2.5.9" +version = "2.5.10" description = "File identification library for Python" category = "dev" optional = false python-versions = ">=3.7" files = [ - {file = "identify-2.5.9-py2.py3-none-any.whl", hash = "sha256:a390fb696e164dbddb047a0db26e57972ae52fbd037ae68797e5ae2f4492485d"}, - {file = "identify-2.5.9.tar.gz", hash = "sha256:906036344ca769539610436e40a684e170c3648b552194980bb7b617a8daeb9f"}, + {file = "identify-2.5.10-py2.py3-none-any.whl", hash = "sha256:fb7c2feaeca6976a3ffa31ec3236a6911fbc51aec9acc111de2aed99f244ade2"}, + {file = "identify-2.5.10.tar.gz", hash = "sha256:dce9e31fee7dbc45fea36a9e855c316b8fbf807e65a862f160840bb5a2bf5dfd"}, ] [package.extras] @@ -1293,14 +1293,14 @@ test = ["appdirs (==1.4.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock [[package]] name = "plette" -version = "0.4.2" +version = "0.4.4" description = "Structured Pipfile and Pipfile.lock models." category = "main" optional = false python-versions = ">=3.7" files = [ - {file = "plette-0.4.2-py2.py3-none-any.whl", hash = "sha256:7bf014ff695d8badf5a058227db0f0bd1fa7ffd6e54ad8b851bc36c20a4a7894"}, - {file = "plette-0.4.2.tar.gz", hash = "sha256:e4dc4a05bfce68d6f6b8d1ccd6e8957ecf4ed6707e8d32f7188b6e628526644e"}, + {file = "plette-0.4.4-py2.py3-none-any.whl", hash = "sha256:42d68ce8c6b966874b68758d87d7f20fcff2eff0d861903eea1062126be4d98f"}, + {file = "plette-0.4.4.tar.gz", hash = "sha256:06b8c09eb90293ad0b8101cb5c95c4ea53e9b2b582901845d0904ff02d237454"}, ] [package.dependencies] @@ -1940,14 +1940,14 @@ files = [ [[package]] name = "traitlets" -version = "5.7.0" +version = "5.7.1" description = "Traitlets Python configuration system" category = "dev" optional = false python-versions = ">=3.7" files = [ - {file = "traitlets-5.7.0-py3-none-any.whl", hash = "sha256:61832ea7b7f910f5745e27e9bb269a181fd15af76027d99560299209d5b17c94"}, - {file = "traitlets-5.7.0.tar.gz", hash = "sha256:bd0fca5c890a09bf66b33cce67ca14156b080429bc39c7ef26b075a4bd4f9fc3"}, + {file = "traitlets-5.7.1-py3-none-any.whl", hash = "sha256:57ba2ba951632eeab9388fa45f342a5402060a5cc9f0bb942f760fafb6641581"}, + {file = "traitlets-5.7.1.tar.gz", hash = "sha256:fde8f62c05204ead43c2c1b9389cfc85befa7f54acb5da28529d671175bb4108"}, ] [package.extras] From abd5eb2328824e4539d17aa1b888b6af1eeba982 Mon Sep 17 00:00:00 2001 From: staticdev Date: Thu, 15 Dec 2022 21:33:13 +0100 Subject: [PATCH 4/4] Rollback poetry 1.2.2 --- .github/workflows/constraints.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/constraints.txt b/.github/workflows/constraints.txt index 983dcc171..e811331f0 100644 --- a/.github/workflows/constraints.txt +++ b/.github/workflows/constraints.txt @@ -1,3 +1,3 @@ pip==22.3.1 -poetry==1.3.0 +poetry==1.2.2 virtualenv==20.17.1