From 5ba72a68646cf38997b14e86c23b3b8675a96273 Mon Sep 17 00:00:00 2001 From: "TEAM 4.0[bot]" Date: Tue, 7 Feb 2023 09:04:05 +0000 Subject: [PATCH] Release v2.1.0 - Changelog --- .github/workflows/cd_release.yml | 2 +- .../ci_cd_updated_default_branch.yml | 2 +- .../ci_check_pyproject_dependencies.yml | 2 +- .github/workflows/ci_tests.yml | 2 +- CHANGELOG.md | 29 +++++++++++++++++-- ci_cd/__init__.py | 2 +- docs/hooks/docs_api_reference.md | 2 +- docs/hooks/docs_landing_page.md | 2 +- docs/index.md | 2 +- docs/workflows/cd_release.md | 4 +-- docs/workflows/ci_automerge_prs.md | 6 ++-- .../workflows/ci_cd_updated_default_branch.md | 2 +- .../ci_check_pyproject_dependencies.md | 2 +- docs/workflows/ci_tests.md | 4 +-- docs/workflows/ci_update_dependencies.md | 2 +- 15 files changed, 44 insertions(+), 21 deletions(-) diff --git a/.github/workflows/cd_release.yml b/.github/workflows/cd_release.yml index 6fb91877..eed773ce 100644 --- a/.github/workflows/cd_release.yml +++ b/.github/workflows/cd_release.yml @@ -131,7 +131,7 @@ jobs: python -m pip install -U pip pip install -U setuptools wheel build pip install ${EDITABLE}.${{ inputs.install_extras }} - pip install git+https://github.com/SINTEF/ci-cd.git@v2.0.0 + pip install git+https://github.com/SINTEF/ci-cd.git@v2.1.0 - name: Update changelog uses: CharMixer/auto-changelog-action@v1 diff --git a/.github/workflows/ci_cd_updated_default_branch.yml b/.github/workflows/ci_cd_updated_default_branch.yml index 02a901dd..ad2d1e34 100644 --- a/.github/workflows/ci_cd_updated_default_branch.yml +++ b/.github/workflows/ci_cd_updated_default_branch.yml @@ -159,7 +159,7 @@ jobs: python -m pip install --upgrade pip pip install -U setuptools wheel pip install ${EDITABLE}.${{ inputs.doc_extras }} - pip install git+https://github.com/SINTEF/ci-cd.git@v2.0.0 + pip install git+https://github.com/SINTEF/ci-cd.git@v2.1.0 - name: Set up git user if: env.RELEASE_RUN == 'false' diff --git a/.github/workflows/ci_check_pyproject_dependencies.yml b/.github/workflows/ci_check_pyproject_dependencies.yml index ddc1f9e9..45275b2e 100644 --- a/.github/workflows/ci_check_pyproject_dependencies.yml +++ b/.github/workflows/ci_check_pyproject_dependencies.yml @@ -68,7 +68,7 @@ jobs: python -m pip install -U pip pip install -U setuptools wheel pip install .${{ inputs.install_extras }} - pip install git+https://github.com/SINTEF/ci-cd.git@v2.0.0 + pip install git+https://github.com/SINTEF/ci-cd.git@v2.1.0 - name: Set up git user run: | diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 61104184..f076ea85 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -285,7 +285,7 @@ jobs: python -m pip install -U pip pip install -U setuptools wheel pip install ${EDITABLE}.${{ inputs.install_extras }} - pip install git+https://github.com/SINTEF/ci-cd.git@v2.0.0 + pip install git+https://github.com/SINTEF/ci-cd.git@v2.1.0 - name: Update API Reference if: inputs.update_python_api_ref diff --git a/CHANGELOG.md b/CHANGELOG.md index 12ebb3d7..fb2f836a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,24 +2,47 @@ ## [Unreleased](https://github.com/SINTEF/ci-cd/tree/HEAD) -[Full Changelog](https://github.com/SINTEF/ci-cd/compare/v2.0.0...HEAD) +[Full Changelog](https://github.com/SINTEF/ci-cd/compare/v2.1.0...HEAD) **Implemented enhancements:** -- Make `test: true` actually work for "CD - Release" [\#83](https://github.com/SINTEF/ci-cd/issues/83) +- Use custom token when possible [\#104](https://github.com/SINTEF/ci-cd/issues/104) + +## [v2.1.0](https://github.com/SINTEF/ci-cd/tree/v2.1.0) (2023-02-07) + +[Full Changelog](https://github.com/SINTEF/ci-cd/compare/v2.0.0...v2.1.0) + +**Implemented enhancements:** + +- Extend "automerge" workflow with changes [\#69](https://github.com/SINTEF/ci-cd/issues/69) **Closed issues:** -- Drop using a `vMAJOR` dynamic tag [\#81](https://github.com/SINTEF/ci-cd/issues/81) +- Acknowledge testing dependencies in pyproject.toml [\#93](https://github.com/SINTEF/ci-cd/issues/93) + +**Merged pull requests:** + +- Always try to use `PAT` prior to `GITHUB_TOKEN` [\#105](https://github.com/SINTEF/ci-cd/pull/105) ([CasperWA](https://github.com/CasperWA)) +- \[Auto-generated\] Update dependencies [\#103](https://github.com/SINTEF/ci-cd/pull/103) ([TEAM4-0](https://github.com/TEAM4-0)) +- \[Auto-generated\] Update dependencies [\#97](https://github.com/SINTEF/ci-cd/pull/97) ([TEAM4-0](https://github.com/TEAM4-0)) +- Changes prior to auto-merge [\#88](https://github.com/SINTEF/ci-cd/pull/88) ([CasperWA](https://github.com/CasperWA)) ## [v2.0.0](https://github.com/SINTEF/ci-cd/tree/v2.0.0) (2022-12-06) [Full Changelog](https://github.com/SINTEF/ci-cd/compare/v1.3.5...v2.0.0) +**Implemented enhancements:** + +- Make `test: true` actually work for "CD - Release" [\#83](https://github.com/SINTEF/ci-cd/issues/83) + **Fixed bugs:** - Bad usage of backticks in warning message [\#79](https://github.com/SINTEF/ci-cd/issues/79) +**Closed issues:** + +- Drop using a `vMAJOR` dynamic tag [\#81](https://github.com/SINTEF/ci-cd/issues/81) + **Merged pull requests:** - \[Auto-generated\] Update dependencies [\#85](https://github.com/SINTEF/ci-cd/pull/85) ([TEAM4-0](https://github.com/TEAM4-0)) diff --git a/ci_cd/__init__.py b/ci_cd/__init__.py index b3f645e0..b5734cf4 100644 --- a/ci_cd/__init__.py +++ b/ci_cd/__init__.py @@ -1,4 +1,4 @@ """CI/CD Tools. Tiny package to run invoke tasks as a standalone program.""" -__version__ = "2.0.0" +__version__ = "2.1.0" __author__ = "Casper Welzel Andersen" __author_email__ = "casper.w.andersen@sintef.no" diff --git a/docs/hooks/docs_api_reference.md b/docs/hooks/docs_api_reference.md index e580aa83..ca07db74 100644 --- a/docs/hooks/docs_api_reference.md +++ b/docs/hooks/docs_api_reference.md @@ -58,7 +58,7 @@ It is meant to be complete as is. ```yaml repos: - repo: https://github.com/SINTEF/ci-cd - rev: v2.0.0 + rev: v2.1.0 hooks: - id: docs-api-reference args: diff --git a/docs/hooks/docs_landing_page.md b/docs/hooks/docs_landing_page.md index f0269018..903898d5 100644 --- a/docs/hooks/docs_landing_page.md +++ b/docs/hooks/docs_landing_page.md @@ -32,7 +32,7 @@ It is meant to be complete as is. ```yaml repos: - repo: https://github.com/SINTEF/ci-cd - rev: v2.0.0 + rev: v2.1.0 hooks: - id: docs-landing-page args: diff --git a/docs/index.md b/docs/index.md index e0f80e5d..6547fc60 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,6 +1,6 @@ # CI/CD tools -**Current version to use:** `v2.0.0` +**Current version to use:** `v2.1.0` Use tried and tested continuous integration (CI) and continuous deployment (CD) tools from this repository. diff --git a/docs/workflows/cd_release.md b/docs/workflows/cd_release.md index caa8150d..805aeae1 100644 --- a/docs/workflows/cd_release.md +++ b/docs/workflows/cd_release.md @@ -29,7 +29,7 @@ See the [proper section](../hooks/docs_api_reference.md#using-it-together-with-c The content of repository files can be updated to use the new version where necessary. This is done through the `version_update_changes` (and `version_update_changes_separator`) inputs. -To see an example of how to use the `version_update_changes` (and `version_update_changes_separator`) see for example the [workflow used by the SINTEF/ci-cd repository](https://github.com/SINTEF/ci-cd/blob/v2.0.0/.github/workflows/_local_cd_release.yml) calling the _CD Release_ workflow. +To see an example of how to use the `version_update_changes` (and `version_update_changes_separator`) see for example the [workflow used by the SINTEF/ci-cd repository](https://github.com/SINTEF/ci-cd/blob/v2.1.0/.github/workflows/_local_cd_release.yml) calling the _CD Release_ workflow. Some notes to consider and respect when using `version_update_changes` are: @@ -108,7 +108,7 @@ on: jobs: publish: name: Publish package and documentation - uses: SINTEF/ci-cd/.github/workflows/cd_release.yml@v2.0.0 + uses: SINTEF/ci-cd/.github/workflows/cd_release.yml@v2.1.0 if: github.repository == 'SINTEF/my-python-package' && startsWith(github.ref, 'refs/tags/v') with: git_username: "Casper Welzel Andersen" diff --git a/docs/workflows/ci_automerge_prs.md b/docs/workflows/ci_automerge_prs.md index 7e353113..a6bffe4f 100644 --- a/docs/workflows/ci_automerge_prs.md +++ b/docs/workflows/ci_automerge_prs.md @@ -52,7 +52,7 @@ on: jobs: update-dependency-branch: name: Call external workflow - uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.0.0 + uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.1.0 if: github.repository_owner == 'SINTEF' && ( ( startsWith(github.event.pull_request.head.ref, 'dependabot/') && github.actor == 'dependabot[bot]' ) || ( github.event.pull_request.head.ref == 'ci/update-pyproject' && github.actor == 'CasperWA' ) ) secrets: PAT: ${{ secrets.RELEASE_PAT }} @@ -73,7 +73,7 @@ on: jobs: update-dependency-branch: name: Call external workflow - uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v1 + uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.1.0 if: github.repository_owner == 'SINTEF' && ( ( startsWith(github.event.pull_request.head.ref, 'dependabot/') && github.actor == 'dependabot[bot]' ) || ( github.event.pull_request.head.ref == 'ci/update-pyproject' && github.actor == 'CasperWA' ) ) with: perform_changes: true @@ -97,7 +97,7 @@ on: jobs: update-dependency-branch: name: Call external workflow - uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v1 + uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.1.0 if: github.repository_owner == 'SINTEF' && ( ( startsWith(github.event.pull_request.head.ref, 'dependabot/') && github.actor == 'dependabot[bot]' ) || ( github.event.pull_request.head.ref == 'ci/update-pyproject' && github.actor == 'CasperWA' ) ) with: perform_changes: true diff --git a/docs/workflows/ci_cd_updated_default_branch.md b/docs/workflows/ci_cd_updated_default_branch.md index ae21eb57..0839febf 100644 --- a/docs/workflows/ci_cd_updated_default_branch.md +++ b/docs/workflows/ci_cd_updated_default_branch.md @@ -79,7 +79,7 @@ on: jobs: updates-to-stable: name: Call external workflow - uses: SINTEF/ci-cd/.github/workflows/ci_cd_updated_default_branch.yml@v2.0.0 + uses: SINTEF/ci-cd/.github/workflows/ci_cd_updated_default_branch.yml@v2.1.0 if: github.repository_owner == 'SINTEF' with: git_username: "Casper Welzel Andersen" diff --git a/docs/workflows/ci_check_pyproject_dependencies.md b/docs/workflows/ci_check_pyproject_dependencies.md index a6e78c9b..4920e9a9 100644 --- a/docs/workflows/ci_check_pyproject_dependencies.md +++ b/docs/workflows/ci_check_pyproject_dependencies.md @@ -51,7 +51,7 @@ on: jobs: check-dependencies: name: Call external workflow - uses: SINTEF/ci-cd/.github/workflows/ci_check_pyproject_dependencies.yml@v2.0.0 + uses: SINTEF/ci-cd/.github/workflows/ci_check_pyproject_dependencies.yml@v2.1.0 if: github.repository_owner == 'SINTEF' with: git_username: "Casper Welzel Andersen" diff --git a/docs/workflows/ci_tests.md b/docs/workflows/ci_tests.md index 92408379..fafef30d 100644 --- a/docs/workflows/ci_tests.md +++ b/docs/workflows/ci_tests.md @@ -136,7 +136,7 @@ on: jobs: tests: name: Run basic tests - uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.0.0 + uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.1.0 with: python_version_pylint_safety: "3.8" python_version_docs: "3.7" @@ -164,7 +164,7 @@ on: jobs: tests: name: Run basic tests - uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.0.0 + uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.1.0 with: python_version_pylint_safety: "3.8" python_version_docs: "3.7" diff --git a/docs/workflows/ci_update_dependencies.md b/docs/workflows/ci_update_dependencies.md index 79cd75d6..e088f54b 100644 --- a/docs/workflows/ci_update_dependencies.md +++ b/docs/workflows/ci_update_dependencies.md @@ -62,7 +62,7 @@ on: jobs: check-dependencies: name: Call external workflow - uses: SINTEF/ci-cd/.github/workflows/ci_update_dependencies.yml@v2.0.0 + uses: SINTEF/ci-cd/.github/workflows/ci_update_dependencies.yml@v2.1.0 if: github.repository_owner == 'SINTEF' with: git_username: "Casper Welzel Andersen"