There are merge conflicts between master and dependabot/pip/openpyxl-3.1.5. - #2976

Closed

xavierfingers wants to merge 1095 commits into

geekcomputers:dependabot/pip/openpyxl-3.1.5from

xavierfingers:master

This pull request is big! We're only showing the most recent 250 commits

Commits on Aug 2, 2025

Commits on Aug 3, 2025

fix code
lighting9999
committed
af8e781
fix
lighting9999
committed
7da6e92

Commits on Aug 4, 2025

Bump inquirer from 3.4.0 to 3.4.1
dependabot[bot]
authored
758d8c8

Commits on Aug 5, 2025

Bump solara from 1.50.1 to 1.51.0
dependabot[bot]
authored
c4f8a68

Commits on Aug 6, 2025

Bump openai from 1.98.0 to 1.99.1
dependabot[bot]
authored
2680113

Commits on Aug 7, 2025

Commits on Aug 8, 2025

Commits on Aug 12, 2025

Bump slab from 1.8.0 to 1.8.2
dependabot[bot]
authored
edd8a16

Commits on Aug 13, 2025

Bump tornado from 6.5.1 to 6.5.2
dependabot[bot]
authored
fb07b84
Move the same python programs in the same directory
lighting9999
committed
f6da680
Upgrade python workflows to Morden
lighting9999
committed
8afbb79
fix bugs
lighting9999
committed
97a44c7
fix
lighting9999
committed
5d4736f
fix
lighting9999
committed
e0ba3b7
Update python.yml
lighting9999
authored
67a34ef
Bump ccxt from 4.4.99 to 4.5.0
dependabot[bot]
authored
d863c61

Commits on Aug 14, 2025

Commits on Aug 16, 2025

Commits on Aug 17, 2025

Frogrowl 🐸
FROGROWL
committed
364f946
Merge pull request #2844 from FROGROWL/master
geekcomputers
authored
d65cbc6

Commits on Aug 18, 2025

step-by-step Collatz sequence
BhavanKumarGM
committed
48e31ce

Commits on Aug 19, 2025

Bump google-api-python-client from 2.177.0 to 2.179.0
dependabot[bot]
authored
9132142
Bump pyglet from 2.1.6 to 2.1.8
dependabot[bot]
authored
a5b0c83

Commits on Aug 20, 2025

Bump openai from 1.99.9 to 1.100.2
dependabot[bot]
authored
2f1b969

Commits on Aug 22, 2025

Upgrade python Workflows
lighting9999
authored
833bb91
Upgrade python.yml
lighting9999
authored
57e8353
Create SECURITY.md
lighting9999
authored
7888857
Create Codeql.yml
lighting9999
authored
5d3080d
更新 Codeql.yml
lighting9999
authored
51c8af0
更新 Codeql.yml
lighting9999
authored
15f38cd
更新 Codeql.yml
lighting9999
authored
cc6c9b2
Upgrade Codeql.yml
lighting9999
authored
35858f8
Upgrade Codeql.yml
lighting9999
authored
aba2932
Upgrade Codeql.yml
lighting9999
authored
ccb717b
Merge pull request #2845 from BhavanKumarGM/Bhavan-Kumar-G-M
geekcomputers
authored
409706d
Merge pull request #2846 from geekcomputers/dependabot/pip/google-api-python-client-2.179.0
geekcomputers
authored
3a2e48f
Merge pull request #2847 from geekcomputers/dependabot/pip/pyglet-2.1.8
geekcomputers
authored
683cc35
Merge pull request #2849 from geekcomputers/dependabot/pip/openai-1.100.2
geekcomputers
authored
0997a7b
Merge pull request #2851 from lighting9999/patch-2
geekcomputers
authored
3815c24
Merge branch 'geekcomputers:master' into patch-1
lighting9999
authored
7aa06eb
Merge pull request #2850 from lighting9999/patch-1
geekcomputers
authored
9fd0e65
Bump twilio from 9.7.0 to 9.7.1
dependabot[bot]
authored
93de5ad
Bump solara from 1.51.0 to 1.51.1
dependabot[bot]
authored
9a359e6

Commits on Aug 23, 2025

fix Codeql.yml
lighting9999
authored
70c09a6
Upgrade Codeql.yml
lighting9999
authored
841f853
Upgrade Codeql.yml
lighting9999
authored
e42c6e8
Merge pull request #2853 from geekcomputers/dependabot/pip/twilio-9.7.1
geekcomputers
authored
2c2bd73
Merge pull request #2855 from geekcomputers/dependabot/pip/solara-1.51.1
geekcomputers
authored
f9aeabe
Merge pull request #2856 from lighting9999/patch-3
geekcomputers
authored
fd19869

Commits on Aug 26, 2025

Bump pandas from 2.3.1 to 2.3.2
dependabot[bot]
authored
bf8c846
Bump ccxt from 4.5.0 to 4.5.2
dependabot[bot]
authored
a789ede

Commits on Aug 27, 2025

Commits on Aug 28, 2025

Bump pymongo from 4.14.0 to 4.14.1
dependabot[bot]
authored
b098549
Bump openai from 1.100.2 to 1.102.0
dependabot[bot]
authored
f32992d

Commits on Aug 31, 2025

Commits on Sep 1, 2025

adding a rock_paper_scissors game
DEVANSH-GAJJAR
committed
120994f
adding a rock_paper_scissors game
DEVANSH-GAJJAR
committed
27e1df1

Commits on Sep 2, 2025

Bump requests from 2.32.4 to 2.32.5
dependabot[bot]
authored
3ddcd22
Bump httplib2 from 0.22.0 to 0.30.0
dependabot[bot]
authored
79f7f92

Commits on Sep 4, 2025

Commits on Sep 6, 2025

Commits on Sep 8, 2025

Bump google-api-python-client from 2.179.0 to 2.181.0
dependabot[bot]
authored
9777eb8

Commits on Sep 10, 2025

Bump openai from 1.102.0 to 1.107.1
dependabot[bot]
authored
bb34ff1

Commits on Sep 13, 2025

Commits on Sep 15, 2025

Bump pytest from 8.4.1 to 8.4.2
dependabot[bot]
authored
e0ad9ce

Commits on Sep 16, 2025

Bump pymongo from 4.14.1 to 4.15.1
dependabot[bot]
authored
491c936

Commits on Sep 17, 2025

Add docs and new future for time_delta.py
lighting9999
authored
39a645d

Commits on Sep 18, 2025

Add f string example
Atticus-Beard
authored
0644627
Bump pyperclip from 1.8.2 to 1.10.0
dependabot[bot]
authored
a4623e8

Commits on Sep 19, 2025

fix bugs
lighting9999
committed
9c0a42d
delete no need workflows.
lighting9999
committed
b93f497
delete no need files.
lighting9999
committed
e1b84ce
delete no need files.
lighting9999
committed
7b8c485
change python Workflows
lighting9999
authored
8c61ba7
Update new_pattern.py
lighting9999
authored
c19a53e
upgrade python.yml
lighting9999
authored
7403339
更新 python.yml
lighting9999
authored
85d6075
更新 python.yml
lighting9999
authored
9852d67
fix python.yml
lighting9999
authored
bd6073e

Commits on Sep 20, 2025

Refactor and update various Python scripts
lighting9999
committed
d3caf5d
Add multiple Tic-Tac-Toe game implementations and a clock difference calculator
lighting9999
committed
cc470f8
fix pytest error
lighting9999
committed
7813768
fix
lighting9999
committed
190dac4
fix
lighting9999
committed
da71c1a

Commits on Sep 21, 2025

Commits on Sep 22, 2025

Commits on Sep 24, 2025

Bump google-api-python-client from 2.181.0 to 2.183.0
dependabot[bot]
authored
6c837f6

Commits on Sep 25, 2025

Commits on Sep 27, 2025

calci2.py
MulkaSandhyaRani
committed
f2d59ff

Commits on Sep 28, 2025

Commits on Sep 29, 2025

Bump httplib2 from 0.30.0 to 0.31.0
dependabot[bot]
authored
15ad07b
Bump beautifulsoup4 from 4.13.5 to 4.14.2
dependabot[bot]
authored
a621695

Commits on Oct 4, 2025

Commits on Oct 6, 2025

Bump selenium from 4.35.0 to 4.36.0
dependabot[bot]
authored
eab102a

Commits on Oct 7, 2025

Commits on Oct 8, 2025

Commits on Oct 9, 2025

Commits on Oct 10, 2025

Bump fastapi from 0.116.1 to 0.118.3
dependabot[bot]
authored
c5e544f

Commits on Oct 11, 2025

Commits on Oct 13, 2025

Bump pyglet from 2.1.8 to 2.1.9
dependabot[bot]
authored
a49a962
Bump pymongo from 4.15.1 to 4.15.3
dependabot[bot]
authored
126e99b

Commits on Oct 15, 2025

Add smart file organizer
sangampaudel530
committed
6ac0345

Commits on Oct 16, 2025

Commits on Oct 17, 2025

Commits on Oct 18, 2025

Commits on Oct 19, 2025

change game
lighting9999
committed
957533b
fix error
lighting9999
committed
4929a7f
upgrade version
lighting9999
committed
5f27d8e
ingore F405
lighting9999
committed
ef88745
Added Password Manager (Tkinter) GUI Project | prashantgohel321
prashantgohel321
committed
feebb9b
Merge pull request #2941 from prashantgohel321/add-password-manager
geekcomputers
authored
06852e9
Merge pull request #2940 from lighting9999/path2
geekcomputers
authored
ebf8cb5

Commits on Oct 20, 2025

Commits on Oct 21, 2025

Commits on Oct 22, 2025

update/refactor: Error less due to file missing
NitkarshChourasia
committed
2e12622
.env file added
NitkarshChourasia
committed
3a2e8ce
rename
NitkarshChourasia
committed
094541f
some corrections
NitkarshChourasia
committed
ee0d637
add .env fix runtime errors
NitkarshChourasia
committed
9c54b37
formatted
NitkarshChourasia
committed
64eef66
snake case folder name
NitkarshChourasia
committed
ca487a0
fix: count upper and lower accurate
NitkarshChourasia
committed
95a9957
add comments
NitkarshChourasia
committed
daf0368
Bump django from 5.1.7 to 5.2.7
dependabot[bot]
authored
c2a69f8
Bump pillow from 11.3.0 to 12.0.0
dependabot[bot]
authored
dafadb2
Bump aiohttp from 3.13.0 to 3.13.1
dependabot[bot]
authored
05f28e8
Merge pull request #2953 from geekcomputers/dependabot/pip/aiohttp-3.13.1
geekcomputers
authored
8d3d497
Merge pull request #2952 from geekcomputers/dependabot/pip/pillow-12.0.0
geekcomputers
authored
6da72ab
Merge pull request #2951 from geekcomputers/dependabot/pip/django-5.2.7
geekcomputers
authored
cd0de7b
Merge pull request #2950 from NitkarshChourasia/master
geekcomputers
authored
90a1c11

Commits on Oct 23, 2025

Commits on Oct 24, 2025

Commits on Oct 27, 2025

Bump pyperclip from 1.10.0 to 1.11.0
dependabot[bot]
authored
db8d0ef

Commits on Oct 28, 2025

Made some changes.
xavierfingers
committed
aa6e7c0

Commits on Oct 29, 2025

Commits on Oct 30, 2025

Bump aiohttp from 3.13.1 to 3.13.2
dependabot[bot]
authored
3e240ef

Commits on Oct 31, 2025

Commits on Nov 1, 2025

Merge pull request #2974 from xavierfingers/circleci-project-setup
geekcomputers
authored
3dfcfd0
Merge pull request #1 from geekcomputers/master
xavierfingers
authored
9d9509f
Merge branch 'dependabot/pip/openpyxl-3.1.5' into master
xavierfingers
authored
8bf49de
Fixed stuff.
xavierfingers
committed
97e8791
Fixed some ruff errors but not all
xavierfingers
committed
40fc01e
pyflaked everything
xavierfingers
committed
d4fefe3