Skip to content

Commit 8c4dae9

Browse files
committed
Merge main branch into copilot/fix-305
Resolved merge conflicts in src/requirements.txt by keeping newer dependency versions while maintaining the h2==4.1.0 and hyperframe==6.0.1 versions that fix the dependency conflict.
2 parents a6c2e83 + 71e1a4a commit 8c4dae9

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

src/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies = [
1515
"watchfiles",
1616
"openai",
1717
"azure-identity",
18-
"aiohttp",
18+
"aiohttp>=3.11.0",
1919
"python-dotenv",
2020
"pyyaml"
2121
]

src/requirements.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
#
2-
# This file is autogenerated by pip-compile with Python 3.12
3-
# by the following command:
4-
#
5-
# pip-compile pyproject.toml
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.12
3+
# by the following command:
4+
#
5+
# pip-compile pyproject.toml
66
#
77
aiofiles==24.1.0
88
# via quart
99
aiohappyeyeballs==2.6.1
1010
# via aiohttp
11-
aiohttp==3.12.14
11+
aiohttp==3.12.14
1212
# via quartapp (pyproject.toml)
1313
aiosignal==1.4.0
1414
# via aiohttp
@@ -72,7 +72,7 @@ httpcore==1.0.9
7272
# via httpx
7373
httptools==0.6.4
7474
# via quartapp (pyproject.toml)
75-
httpx==0.28.1
75+
httpx==0.28.1
7676
# via openai
7777
hypercorn==0.17.3
7878
# via quart
@@ -116,7 +116,7 @@ packaging==25.0
116116
# via gunicorn
117117
priority==2.0.0
118118
# via hypercorn
119-
propcache==0.3.2
119+
propcache==0.3.2
120120
# via
121121
# aiohttp
122122
# yarl
@@ -126,11 +126,11 @@ pydantic==2.11.7
126126
# via openai
127127
pydantic-core==2.33.2
128128
# via pydantic
129-
pyjwt[crypto]==2.10.1
130-
# via
131-
# msal
132-
# pyjwt
133-
python-dotenv==1.1.1
129+
pyjwt[crypto]==2.10.1
130+
# via
131+
# msal
132+
# pyjwt
133+
python-dotenv==1.1.1
134134
# via quartapp (pyproject.toml)
135135
pyyaml==6.0.2
136136
# via quartapp (pyproject.toml)

0 commit comments

Comments
 (0)