Skip to content

解决冲突#1029

Open
YY-Nexus wants to merge 27 commits intoGoogleCloudPlatform:mainfrom
YY-Nexus:main
Open

解决冲突#1029
YY-Nexus wants to merge 27 commits intoGoogleCloudPlatform:mainfrom
YY-Nexus:main

Conversation

@YY-Nexus
Copy link

@YY-Nexus YY-Nexus commented Feb 13, 2026

Pull-Request Template

Thank you for your contribution! Please provide a brief description of your changes and ensure you've completed the checklist below.

Description

What does this PR do?

Why is it necessary?

Fixes # (if applicable)

Checklist

  • Contribution Guidelines: I have read the Contribution Guidelines.
  • CLA: I have signed the CLA.
  • Authorship: I am listed as the author (if applicable).
  • Conventional Commits: My PR title and commit messages follow the Conventional Commits spec.
  • Code Format: I have run nox -s format to format the code.
  • Spelling: I have fixed any spelling errors, and added false positives to .github/actions/spelling/allow.txt if necessary.
  • Sync: My Fork is synced with the upstream.
  • Documentation: I have updated relevant documentation (if applicable) in the docs folder.
  • Template: I have followed the aaie_notebook_template.ipynb if submitting a new jupyter notebook.
  • Experiments: My code is in the experiments folder and is tested and working.

dependabot bot and others added 26 commits September 30, 2025 19:01
Bumps [deepdiff](https://github.com/seperman/deepdiff) from 8.6.0 to 8.6.1.
- [Release notes](https://github.com/seperman/deepdiff/releases)
- [Changelog](https://github.com/seperman/deepdiff/blob/master/docs/changelog.rst)
- [Commits](seperman/deepdiff@8.6.0...8.6.1)

---
updated-dependencies:
- dependency-name: deepdiff
  dependency-version: 8.6.1
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [authlib](https://github.com/authlib/authlib) from 1.6.1 to 1.6.5.
- [Release notes](https://github.com/authlib/authlib/releases)
- [Changelog](https://github.com/authlib/authlib/blob/main/docs/changelog.rst)
- [Commits](authlib/authlib@v1.6.1...v1.6.5)

---
updated-dependencies:
- dependency-name: authlib
  dependency-version: 1.6.5
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [starlette](https://github.com/Kludex/starlette) from 0.47.2 to 0.49.1.
- [Release notes](https://github.com/Kludex/starlette/releases)
- [Changelog](https://github.com/Kludex/starlette/blob/main/docs/release-notes.md)
- [Commits](Kludex/starlette@0.47.2...0.49.1)

---
updated-dependencies:
- dependency-name: starlette
  dependency-version: 0.49.1
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.41.0 to 0.45.0.
- [Commits](golang/crypto@v0.41.0...v0.45.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-version: 0.45.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [fonttools](https://github.com/fonttools/fonttools) from 4.60.1 to 4.61.0.
- [Release notes](https://github.com/fonttools/fonttools/releases)
- [Changelog](https://github.com/fonttools/fonttools/blob/main/NEWS.rst)
- [Commits](fonttools/fonttools@4.60.1...4.61.0)

---
updated-dependencies:
- dependency-name: fonttools
  dependency-version: 4.61.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [werkzeug](https://github.com/pallets/werkzeug) from 3.1.3 to 3.1.4.
- [Release notes](https://github.com/pallets/werkzeug/releases)
- [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst)
- [Commits](pallets/werkzeug@3.1.3...3.1.4)

---
updated-dependencies:
- dependency-name: werkzeug
  dependency-version: 3.1.4
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 4.1.0 to 4.1.1.
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](nodeca/js-yaml@4.1.0...4.1.1)

---
updated-dependencies:
- dependency-name: js-yaml
  dependency-version: 4.1.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
chore(deps): bump fonttools from 4.60.1 to 4.61.0
Bumps [glob](https://github.com/isaacs/node-glob) to 10.5.0 and updates ancestor dependency [eslint-config-next](https://github.com/vercel/next.js/tree/HEAD/packages/eslint-config-next). These dependencies need to be updated together.


Updates `glob` from 10.3.10 to 10.5.0
- [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md)
- [Commits](isaacs/node-glob@v10.3.10...v10.5.0)

Updates `eslint-config-next` from 14.2.33 to 16.0.6
- [Release notes](https://github.com/vercel/next.js/releases)
- [Changelog](https://github.com/vercel/next.js/blob/canary/release.js)
- [Commits](https://github.com/vercel/next.js/commits/v16.0.6/packages/eslint-config-next)

---
updated-dependencies:
- dependency-name: glob
  dependency-version: 10.5.0
  dependency-type: indirect
- dependency-name: eslint-config-next
  dependency-version: 16.0.6
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
chore(deps): bump werkzeug from 3.1.3 to 3.1.4
…nts/storycraft/multi-b24b6d6dab

chore(deps): bump glob and eslint-config-next in /experiments/storycraft
Bumps [mcp](https://github.com/modelcontextprotocol/python-sdk) from 1.13.0 to 1.23.0.
- [Release notes](https://github.com/modelcontextprotocol/python-sdk/releases)
- [Changelog](https://github.com/modelcontextprotocol/python-sdk/blob/main/RELEASE.md)
- [Commits](modelcontextprotocol/python-sdk@v1.13.0...v1.23.0)

---
updated-dependencies:
- dependency-name: mcp
  dependency-version: 1.23.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.40.0 to 0.45.0.
- [Commits](golang/crypto@v0.40.0...v0.45.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-version: 0.45.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…nts/storycraft/js-yaml-4.1.1

chore(deps-dev): bump js-yaml from 4.1.0 to 4.1.1 in /experiments/storycraft
…s/mcp-genmedia/mcp-genmedia-go/mcp-gemini-go/golang.org/x/crypto-0.45.0

chore(deps): bump golang.org/x/crypto from 0.41.0 to 0.45.0 in /experiments/mcp-genmedia/mcp-genmedia-go/mcp-gemini-go
…nmedia/sample-agents/adk/mcp-1.23.0

chore(deps): bump mcp from 1.13.0 to 1.23.0 in /experiments/mcp-genmedia/sample-agents/adk
Bumps [werkzeug](https://github.com/pallets/werkzeug) from 3.1.3 to 3.1.4.
- [Release notes](https://github.com/pallets/werkzeug/releases)
- [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst)
- [Commits](pallets/werkzeug@3.1.3...3.1.4)

---
updated-dependencies:
- dependency-name: werkzeug
  dependency-version: 3.1.4
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.41.0 to 0.45.0.
- [Commits](golang/crypto@v0.41.0...v0.45.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-version: 0.45.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…nts/mcp-genmedia/sample-agents/adk/mcp-1.23.0

Revert "chore(deps): bump mcp from 1.13.0 to 1.23.0 in /experiments/mcp-genmedia/sample-agents/adk"
…s/mcp-genmedia/mcp-genmedia-go/mcp-veo-go/golang.org/x/crypto-0.45.0

chore(deps): bump golang.org/x/crypto from 0.41.0 to 0.45.0 in /experiments/mcp-genmedia/mcp-genmedia-go/mcp-veo-go
…/mcp-genmedia/mcp-genmedia-go/mcp-common/golang.org/x/crypto-0.45.0

chore(deps): bump golang.org/x/crypto from 0.40.0 to 0.45.0 in /experiments/mcp-genmedia/mcp-genmedia-go/mcp-common
…landia/deepdiff-8.6.1

chore(deps): bump deepdiff from 8.6.0 to 8.6.1 in /experiments/promptlandia
…nmedia/sample-agents/adk/authlib-1.6.5

chore(deps): bump authlib from 1.6.1 to 1.6.5 in /experiments/mcp-genmedia/sample-agents/adk
…app/starlette-0.49.1

chore(deps): bump starlette from 0.47.2 to 0.49.1 in /experiments/babel/app
…werkzeug-3.1.4

chore(deps): bump werkzeug from 3.1.3 to 3.1.4 in /experiments/arena
@YY-Nexus YY-Nexus requested review from a team, awaemmanuel, ghchinoy and mblanc as code owners February 13, 2026 21:44
@google-cla
Copy link

google-cla bot commented Feb 13, 2026

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants