diff --git a/.github/workflows/cd_release.yml b/.github/workflows/cd_release.yml index 8c15a882..f9e1970e 100644 --- a/.github/workflows/cd_release.yml +++ b/.github/workflows/cd_release.yml @@ -179,7 +179,7 @@ jobs: if [ -n "${{ inputs.build_libs }}" ]; then pip install ${{ inputs.build_libs }} fi - pip install git+https://github.com/SINTEF/ci-cd.git@v2.5.2 + pip install git+https://github.com/SINTEF/ci-cd.git@v2.5.3 - name: Parse changelog configuration run: | diff --git a/.github/workflows/ci_cd_updated_default_branch.yml b/.github/workflows/ci_cd_updated_default_branch.yml index ebb84541..c0044149 100644 --- a/.github/workflows/ci_cd_updated_default_branch.yml +++ b/.github/workflows/ci_cd_updated_default_branch.yml @@ -223,7 +223,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.5.2 + pip install git+https://github.com/SINTEF/ci-cd.git@v2.5.3 - 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 5b5866f9..b47f330a 100644 --- a/.github/workflows/ci_check_pyproject_dependencies.yml +++ b/.github/workflows/ci_check_pyproject_dependencies.yml @@ -90,7 +90,7 @@ jobs: python -m pip install -U ${VERBOSE} pip pip install -U ${VERBOSE} setuptools wheel pip install ${VERBOSE} .${{ inputs.install_extras }} - pip install ${VERBOSE} git+https://github.com/SINTEF/ci-cd.git@v2.5.2 + pip install ${VERBOSE} git+https://github.com/SINTEF/ci-cd.git@v2.5.3 - name: Set up git user run: | diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 05d972e8..4e3e0968 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -379,7 +379,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.5.2 + pip install git+https://github.com/SINTEF/ci-cd.git@v2.5.3 - name: Update API Reference if: env.framework == 'mkdocs' && inputs.update_python_api_ref diff --git a/CHANGELOG.md b/CHANGELOG.md index 64333baf..ab9342ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,32 @@ # Changelog +## [Unreleased](https://github.com/SINTEF/ci-cd/tree/HEAD) + +[Full Changelog](https://github.com/SINTEF/ci-cd/compare/v2.5.3...HEAD) + +**Fixed bugs:** + +- A PR is not opened for CI - Check dependencies [\#195](https://github.com/SINTEF/ci-cd/issues/195) + +## [v2.5.3](https://github.com/SINTEF/ci-cd/tree/v2.5.3) (2023-10-25) + +[Full Changelog](https://github.com/SINTEF/ci-cd/compare/v2.5.2...v2.5.3) + +**Implemented enhancements:** + +- Avoid warning for inter-relative extra dependencies [\#198](https://github.com/SINTEF/ci-cd/issues/198) +- Allow branch name customization [\#196](https://github.com/SINTEF/ci-cd/issues/196) + +**Fixed bugs:** + +- Ignore options not parseable [\#194](https://github.com/SINTEF/ci-cd/issues/194) + +**Merged pull requests:** + +- Add project name by default to `already_handled_packages` [\#202](https://github.com/SINTEF/ci-cd/pull/202) ([CasperWA](https://github.com/CasperWA)) +- Customize branch name [\#201](https://github.com/SINTEF/ci-cd/pull/201) ([CasperWA](https://github.com/CasperWA)) +- Handle package-specifier spacing [\#197](https://github.com/SINTEF/ci-cd/pull/197) ([CasperWA](https://github.com/CasperWA)) + ## [v2.5.2](https://github.com/SINTEF/ci-cd/tree/v2.5.2) (2023-10-04) [Full Changelog](https://github.com/SINTEF/ci-cd/compare/v2.5.1...v2.5.2) diff --git a/ci_cd/__init__.py b/ci_cd/__init__.py index 29bbf03d..cd419dc9 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.5.2" +__version__ = "2.5.3" __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 056ca965..d881cf13 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.5.2 + rev: v2.5.3 hooks: - id: docs-api-reference args: diff --git a/docs/hooks/docs_landing_page.md b/docs/hooks/docs_landing_page.md index f76faabc..5f7066af 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.5.2 + rev: v2.5.3 hooks: - id: docs-landing-page args: diff --git a/docs/hooks/update_pyproject.md b/docs/hooks/update_pyproject.md index df5e2917..095419b2 100644 --- a/docs/hooks/update_pyproject.md +++ b/docs/hooks/update_pyproject.md @@ -65,7 +65,7 @@ It is meant to be complete as is. ```yaml repos: - repo: https://github.com/SINTEF/ci-cd - rev: v2.5.2 + rev: v2.5.3 hooks: - id: update-pyproject args: diff --git a/docs/index.md b/docs/index.md index 64bcb37f..18d7df66 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,6 +1,6 @@ # CI/CD tools -**Current version to use:** `v2.5.2` +**Current version to use:** `v2.5.3` 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 5c2b1ede..1a8bea4a 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.5.2/.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.5.3/.github/workflows/_local_cd_release.yml) calling the _CD Release_ workflow. Some notes to consider and respect when using `version_update_changes` are: @@ -139,7 +139,7 @@ on: jobs: publish: name: Publish package and documentation - uses: SINTEF/ci-cd/.github/workflows/cd_release.yml@v2.5.2 + uses: SINTEF/ci-cd/.github/workflows/cd_release.yml@v2.5.3 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 365556b2..2c2db2d7 100644 --- a/docs/workflows/ci_automerge_prs.md +++ b/docs/workflows/ci_automerge_prs.md @@ -55,7 +55,7 @@ on: jobs: update-dependency-branch: name: Call external workflow - uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.5.2 + uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.5.3 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 }} @@ -76,7 +76,7 @@ on: jobs: update-dependency-branch: name: Call external workflow - uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.5.2 + uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.5.3 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 @@ -100,7 +100,7 @@ on: jobs: update-dependency-branch: name: Call external workflow - uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.5.2 + uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.5.3 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 6c35aae8..14fae08d 100644 --- a/docs/workflows/ci_cd_updated_default_branch.md +++ b/docs/workflows/ci_cd_updated_default_branch.md @@ -102,7 +102,7 @@ on: jobs: updates-to-stable: name: Call external workflow - uses: SINTEF/ci-cd/.github/workflows/ci_cd_updated_default_branch.yml@v2.5.2 + uses: SINTEF/ci-cd/.github/workflows/ci_cd_updated_default_branch.yml@v2.5.3 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 7b024c6b..55690e4b 100644 --- a/docs/workflows/ci_check_pyproject_dependencies.md +++ b/docs/workflows/ci_check_pyproject_dependencies.md @@ -37,7 +37,7 @@ Here is an example of different lines given as value for the `ignore` option tha # ... jobs: check-dependencies: - uses: SINTEF/ci-cd/.github/workflows/ci_check_pyproject_dependencies.yml@v2.5.2 + uses: SINTEF/ci-cd/.github/workflows/ci_check_pyproject_dependencies.yml@v2.5.3 with: # ... # For Sphinx, ignore all updates for/from version 4.5.0 and up / keep the minimum version for Sphinx at 4.5.0. @@ -94,7 +94,7 @@ on: jobs: check-dependencies: name: Call external workflow - uses: SINTEF/ci-cd/.github/workflows/ci_check_pyproject_dependencies.yml@v2.5.2 + uses: SINTEF/ci-cd/.github/workflows/ci_check_pyproject_dependencies.yml@v2.5.3 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 010cfdc6..2267eec4 100644 --- a/docs/workflows/ci_tests.md +++ b/docs/workflows/ci_tests.md @@ -163,7 +163,7 @@ on: jobs: tests: name: Run basic tests - uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.5.2 + uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.5.3 with: python_version_pylint_safety: "3.8" python_version_docs: "3.7" @@ -191,7 +191,7 @@ on: jobs: tests: name: Run basic tests - uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.5.2 + uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.5.3 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 b731a10d..bcf6dff0 100644 --- a/docs/workflows/ci_update_dependencies.md +++ b/docs/workflows/ci_update_dependencies.md @@ -65,7 +65,7 @@ on: jobs: check-dependencies: name: Call external workflow - uses: SINTEF/ci-cd/.github/workflows/ci_update_dependencies.yml@v2.5.2 + uses: SINTEF/ci-cd/.github/workflows/ci_update_dependencies.yml@v2.5.3 if: github.repository_owner == 'SINTEF' with: git_username: "Casper Welzel Andersen"