Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: baloise/gitopscli
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v5.9.0
Choose a base ref
...
head repository: baloise/gitopscli
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v5.9.1
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Jul 15, 2024

  1. build(deps-dev): bump setuptools from 68.2.2 to 70.0.0

    Bumps [setuptools](https://github.com/pypa/setuptools) from 68.2.2 to 70.0.0.
    - [Release notes](https://github.com/pypa/setuptools/releases)
    - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst)
    - [Commits](pypa/setuptools@v68.2.2...v70.0.0)
    
    ---
    updated-dependencies:
    - dependency-name: setuptools
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    dependabot[bot] authored Jul 15, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    2d14d19 View commit details

Commits on Jul 16, 2024

  1. bitbucket - use non deprecated methods to get pull requests

    koenigle authored Jul 16, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    98b6500 View commit details
  2. Merge pull request #232 from baloise/dependabot/pip/setuptools-70.0.0

    build(deps-dev): bump setuptools from 68.2.2 to 70.0.0
    christiansiegel authored Jul 16, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    d1c827f View commit details

Commits on Jul 17, 2024

  1. fix(bitbucket): Fix PR integration

    christiansiegel authored Jul 17, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    769830b View commit details
Showing with 7 additions and 8 deletions.
  1. +2 −2 gitopscli/git_api/bitbucket_git_repo_api_adapter.py
  2. +5 −6 poetry.lock
4 changes: 2 additions & 2 deletions gitopscli/git_api/bitbucket_git_repo_api_adapter.py
Original file line number Diff line number Diff line change
@@ -91,7 +91,7 @@ def merge_pull_request(
_merge_method: Literal["squash", "rebase", "merge"] = "merge",
_merge_parameters: dict[str, Any] | None = None,
) -> None:
pull_request = self.__bitbucket.get_pullrequest(self.__organisation, self.__repository_name, pr_id)
pull_request = self.__bitbucket.get_pull_request(self.__organisation, self.__repository_name, pr_id)
self.__bitbucket.merge_pull_request(
self.__organisation,
self.__repository_name,
@@ -125,7 +125,7 @@ def get_branch_head_hash(self, branch: str) -> str:
return str(branches[0]["latestCommit"])

def get_pull_request_branch(self, pr_id: int) -> str:
pull_request = self.__bitbucket.get_pullrequest(self.__organisation, self.__repository_name, pr_id)
pull_request = self.__bitbucket.get_pull_request(self.__organisation, self.__repository_name, pr_id)
if "errors" in pull_request:
raise GitOpsException(pull_request["errors"][0]["message"])
return str(pull_request["fromRef"]["displayId"])
11 changes: 5 additions & 6 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.