Skip to content

Commit f4c7d13

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/npm-31fba09b8f
2 parents b8fc7d6 + 3bad158 commit f4c7d13

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.devcontainer/cpp/requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
cmake==4.2.0
2-
conan==2.22.2
2+
conan==2.23.0
33
gcovr==8.4

.devcontainer/cpp/requirements.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ colorlog==6.8.2 \
144144
--hash=sha256:3e3e079a41feb5a1b64f978b5ea4f46040a94f11f0e8bbb8261e3dbbeca64d44 \
145145
--hash=sha256:4dcbb62368e2800cb3c5abd348da7e53f6c362dda502ec27c560b2e58a66bd33
146146
# via gcovr
147-
conan==2.22.2 \
148-
--hash=sha256:8df71de27eca903a1a92b292ce32e4b79eee2407ac001e28cae1d1b49869f883
147+
conan==2.23.0 \
148+
--hash=sha256:1a7b34be6fcaa4a4c0342c54187fb87aa4b487a9b4cf2136f2207f8b3a127868
149149
# via -r cpp/requirements.in
150150
distro==1.8.0 \
151151
--hash=sha256:02e111d1dc6a50abb8eed6bf31c3e48ed8b0830d1ea2a1b78c61765c2513fdd8 \
@@ -399,9 +399,9 @@ six==1.16.0 \
399399
--hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
400400
--hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
401401
# via python-dateutil
402-
urllib3==2.5.0 \
403-
--hash=sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760 \
404-
--hash=sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc
402+
urllib3==2.6.0 \
403+
--hash=sha256:c90f7a39f716c572c4e3e58509581ebd83f9b59cced005b7db7ad2d22b0db99f \
404+
--hash=sha256:cb9bcef5a4b345d5da5d145dc3e30834f58e8018828cbc724d30b4cb7d4d49f1
405405
# via
406406
# conan
407407
# requests

0 commit comments

Comments
 (0)