-
Notifications
You must be signed in to change notification settings - Fork 12.8k
There are merge conflicts between master and dependabot/pip/openpyxl-3.1.5. #2976
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
Closed
xavierfingers
wants to merge
1,095
commits into
geekcomputers:dependabot/pip/openpyxl-3.1.5
from
xavierfingers:master
Closed
There are merge conflicts between master and dependabot/pip/openpyxl-3.1.5. #2976
xavierfingers
wants to merge
1,095
commits into
geekcomputers:dependabot/pip/openpyxl-3.1.5
from
xavierfingers:master
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ip/firebase-admin-7.1.0 Bump firebase-admin from 7.0.0 to 7.1.0
…ip/ccxt-4.4.98 Bump ccxt from 4.4.97 to 4.4.98
Bumps [inquirer](https://github.com/magmax/python-inquirer) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/magmax/python-inquirer/releases) - [Commits](magmax/python-inquirer@v3.4.0...v3.4.1) --- updated-dependencies: - dependency-name: inquirer dependency-version: 3.4.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [solara](https://github.com/widgetti/solara) from 1.50.1 to 1.51.0. - [Changelog](https://github.com/widgetti/solara/blob/master/CHANGELOG.md) - [Commits](widgetti/solara@v1.50.1...v1.51.0) --- updated-dependencies: - dependency-name: solara dependency-version: 1.51.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [openai](https://github.com/openai/openai-python) from 1.98.0 to 1.99.1. - [Release notes](https://github.com/openai/openai-python/releases) - [Changelog](https://github.com/openai/openai-python/blob/main/CHANGELOG.md) - [Commits](openai/openai-python@v1.98.0...v1.99.1) --- updated-dependencies: - dependency-name: openai dependency-version: 1.99.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…ip/inquirer-3.4.1 Bump inquirer from 3.4.0 to 3.4.1
…ip/solara-1.51.0 Bump solara from 1.50.1 to 1.51.0
…ip/openai-1.99.1 Bump openai from 1.98.0 to 1.99.1
Python command-line tool that fetches recent news articles based on a search query using NewsAPI and summarizes the article content using extractive summarization. You can also save the summaries to a text file.
Bumps [pymongo](https://github.com/mongodb/mongo-python-driver) from 4.13.2 to 4.14.0. - [Release notes](https://github.com/mongodb/mongo-python-driver/releases) - [Changelog](https://github.com/mongodb/mongo-python-driver/blob/master/doc/changelog.rst) - [Commits](mongodb/mongo-python-driver@4.13.2...4.14.0) --- updated-dependencies: - dependency-name: pymongo dependency-version: 4.14.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [ccxt](https://github.com/ccxt/ccxt) from 4.4.98 to 4.4.99. - [Release notes](https://github.com/ccxt/ccxt/releases) - [Changelog](https://github.com/ccxt/ccxt/blob/master/CHANGELOG.md) - [Commits](ccxt/ccxt@v4.4.98...v4.4.99) --- updated-dependencies: - dependency-name: ccxt dependency-version: 4.4.99 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [openai](https://github.com/openai/openai-python) from 1.99.1 to 1.99.5. - [Release notes](https://github.com/openai/openai-python/releases) - [Changelog](https://github.com/openai/openai-python/blob/main/CHANGELOG.md) - [Commits](openai/openai-python@v1.99.1...v1.99.5) --- updated-dependencies: - dependency-name: openai dependency-version: 1.99.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…plifier-tool Create news_oversimplifier.py
…ip/pymongo-4.14.0 Bump pymongo from 4.13.2 to 4.14.0
…ip/ccxt-4.4.99 Bump ccxt from 4.4.98 to 4.4.99
…ip/openai-1.99.5 Bump openai from 1.99.1 to 1.99.5
Bumps [slab](https://github.com/DrMarc/slab) from 1.8.0 to 1.8.2. - [Release notes](https://github.com/DrMarc/slab/releases) - [Commits](DrMarc/slab@v1.8.0...v1.8.2) --- updated-dependencies: - dependency-name: slab dependency-version: 1.8.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [tornado](https://github.com/tornadoweb/tornado) from 6.5.1 to 6.5.2. - [Changelog](https://github.com/tornadoweb/tornado/blob/master/docs/releases.rst) - [Commits](tornadoweb/tornado@v6.5.1...v6.5.2) --- updated-dependencies: - dependency-name: tornado dependency-version: 6.5.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [ccxt](https://github.com/ccxt/ccxt) from 4.4.99 to 4.5.0. - [Release notes](https://github.com/ccxt/ccxt/releases) - [Changelog](https://github.com/ccxt/ccxt/blob/master/CHANGELOG.md) - [Commits](ccxt/ccxt@v4.4.99...v4.5.0) --- updated-dependencies: - dependency-name: ccxt dependency-version: 4.5.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…ip/slab-1.8.2 Bump slab from 1.8.0 to 1.8.2
…ip/tornado-6.5.2 Bump tornado from 6.5.1 to 6.5.2
…ip/fastapi-0.120.0 Bump fastapi from 0.119.1 to 0.120.0
…ip/ccxt-4.5.12 Bump ccxt from 4.5.11 to 4.5.12
Bumps [pyperclip](https://github.com/asweigart/pyperclip) from 1.10.0 to 1.11.0. - [Changelog](https://github.com/asweigart/pyperclip/blob/master/CHANGES.txt) - [Commits](https://github.com/asweigart/pyperclip/commits) --- updated-dependencies: - dependency-name: pyperclip dependency-version: 1.11.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [ccxt](https://github.com/ccxt/ccxt) from 4.5.12 to 4.5.14. - [Release notes](https://github.com/ccxt/ccxt/releases) - [Changelog](https://github.com/ccxt/ccxt/blob/master/exchanges.cfg) - [Commits](ccxt/ccxt@v4.5.12...v4.5.14) --- updated-dependencies: - dependency-name: ccxt dependency-version: 4.5.14 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [fastapi](https://github.com/fastapi/fastapi) from 0.120.0 to 0.120.2. - [Release notes](https://github.com/fastapi/fastapi/releases) - [Commits](fastapi/fastapi@0.120.0...0.120.2) --- updated-dependencies: - dependency-name: fastapi dependency-version: 0.120.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…ip/pyperclip-1.11.0 Bump pyperclip from 1.10.0 to 1.11.0
--- updated-dependencies: - dependency-name: aiohttp dependency-version: 3.13.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…ip/aiohttp-3.13.2 Bump aiohttp from 3.13.1 to 3.13.2
…ip/fastapi-0.120.2 Bump fastapi from 0.120.0 to 0.120.2
…ip/ccxt-4.5.14 Bump ccxt from 4.5.12 to 4.5.14
Bumps [psutil](https://github.com/giampaolo/psutil) from 7.1.1 to 7.1.2. - [Changelog](https://github.com/giampaolo/psutil/blob/master/HISTORY.rst) - [Commits](giampaolo/psutil@release-7.1.1...release-7.1.2) --- updated-dependencies: - dependency-name: psutil dependency-version: 7.1.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Made some changes.
Bumps [keras](https://github.com/keras-team/keras) from 3.11.3 to 3.12.0. - [Release notes](https://github.com/keras-team/keras/releases) - [Commits](keras-team/keras@v3.11.3...v3.12.0) --- updated-dependencies: - dependency-name: keras dependency-version: 3.12.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [google-api-python-client](https://github.com/googleapis/google-api-python-client) from 2.185.0 to 2.186.0. - [Release notes](https://github.com/googleapis/google-api-python-client/releases) - [Commits](googleapis/google-api-python-client@v2.185.0...v2.186.0) --- updated-dependencies: - dependency-name: google-api-python-client dependency-version: 2.186.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…ip/psutil-7.1.2 Bump psutil from 7.1.1 to 7.1.2
…ip/keras-3.12.0 Bump keras from 3.11.3 to 3.12.0
…ip/google-api-python-client-2.186.0 Bump google-api-python-client from 2.185.0 to 2.186.0
…ject-setup Add .circleci/config.yml
Merge necessary changes
Contributor
Author
Contributor
Author
|
@dependabot rg |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.