Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump pyyaml from 6.0 to 6.0.1 #130

Merged
merged 2 commits into from
Apr 25, 2024
Merged

Bump pyyaml from 6.0 to 6.0.1 #130

merged 2 commits into from
Apr 25, 2024

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jul 24, 2023

Bumps pyyaml from 6.0 to 6.0.1.

Changelog

Sourced from pyyaml's changelog.

6.0.1 (2023-07-18)

Commits

Dependabot compatibility score

You can trigger a rebase of this PR by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Note
Automatic rebases have been disabled on this pull request as it has been open for over 30 days.

Bumps [pyyaml](https://github.com/yaml/pyyaml) from 6.0 to 6.0.1.
- [Changelog](https://github.com/yaml/pyyaml/blob/6.0.1/CHANGES)
- [Commits](yaml/pyyaml@6.0...6.0.1)

---
updated-dependencies:
- dependency-name: pyyaml
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot requested a review from a team as a code owner July 24, 2023 17:27
@dependabot dependabot bot added the dependencies Pull requests that update a dependency file label Jul 24, 2023
@bert-e
Copy link
Contributor

bert-e commented Jul 24, 2023

Hello dependabot[bot],

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

The following options are set: bypass_author_approval, bypass_jira_check

@dependabot dependabot bot changed the base branch from development/3.8 to development/3.9 July 26, 2023 21:56
@bert-e
Copy link
Contributor

bert-e commented Sep 5, 2023

Conflict

There is a conflict between your branch dependabot/pip/pyyaml-6.0.1 and the
destination branch development/3.9.

Please resolve the conflict on the feature branch (dependabot/pip/pyyaml-6.0.1).

git fetch && \
git checkout origin/dependabot/pip/pyyaml-6.0.1 && \
git merge origin/development/3.9

Resolve merge conflicts and commit

git push origin HEAD:dependabot/pip/pyyaml-6.0.1

The following options are set: bypass_author_approval, bypass_jira_check

@dependabot dependabot bot changed the base branch from development/3.9 to development/3.10 November 14, 2023 19:51
@bert-e
Copy link
Contributor

bert-e commented Nov 14, 2023

Conflict

There is a conflict between your branch dependabot/pip/pyyaml-6.0.1 and the
destination branch development/3.10.

Please resolve the conflict on the feature branch (dependabot/pip/pyyaml-6.0.1).

git fetch && \
git checkout origin/dependabot/pip/pyyaml-6.0.1 && \
git merge origin/development/3.10

Resolve merge conflicts and commit

git push origin HEAD:dependabot/pip/pyyaml-6.0.1

The following options are set: bypass_author_approval, bypass_jira_check

@dependabot dependabot bot changed the base branch from development/3.10 to development/3.11 January 26, 2024 19:12
@bert-e
Copy link
Contributor

bert-e commented Jan 26, 2024

Conflict

There is a conflict between your branch dependabot/pip/pyyaml-6.0.1 and the
destination branch development/3.11.

Please resolve the conflict on the feature branch (dependabot/pip/pyyaml-6.0.1).

git fetch && \
git checkout origin/dependabot/pip/pyyaml-6.0.1 && \
git merge origin/development/3.11

Resolve merge conflicts and commit

git push origin HEAD:dependabot/pip/pyyaml-6.0.1

The following options are set: bypass_author_approval, bypass_jira_check

@tcarmet tcarmet enabled auto-merge (squash) April 25, 2024 21:11
@tcarmet tcarmet merged commit af08272 into main Apr 25, 2024
8 checks passed
@tcarmet tcarmet deleted the dependabot/pip/pyyaml-6.0.1 branch April 25, 2024 21:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants