chore: fix conflicts update deps

Author: wpk-nist-gov

pyproject.toml

@@ -311,16 +311,6 @@ pytest-accept = { pip = true }
 [tool.pyproject2conda.envs.dev]
 groups = "dev"
 
-<<<<<<< before updating
-[tool.pyproject2conda.envs.pre-commit-additional-dependencies]
-reqs = [
-    "rust-just",
-]
-skip-package = true
-style = "requirements"
-
-=======
->>>>>>> after updating
 [tool.pyproject2conda.envs.test]
 groups = "test"
 python = "all"

requirements/lock/pre-commit-additional-dependencies.txt

@@ -87,16 +87,16 @@ prek==0.3.6 \
     --hash=sha256:cbc7f0b344432630e990a6c6dd512773fbb7253c8df3c3f78eedd80b115ed3c9 \
     --hash=sha256:d663f1c467dccbd414ab0caa323230f33aa27797c575d98af1013866e1f83a12
     # via -r requirements/uvx-tools.txt
-pyrefly==0.57.0 \
-    --hash=sha256:1413ac880ecf0cc4def339892a3b8ca065f1ae7dff94d1a8c8160fbf0068be3a \
-    --hash=sha256:19e2c14533c00ae6e63ac38c6000e32badde5f573ca5c1cd969ecab129de89ec \
-    --hash=sha256:2dd048bb1db13ab42281e440306b57308fe89fde362fe622b507f3db81037d38 \
-    --hash=sha256:2e1d67165d6db8bf1da8df3b88d16dd899980367bbae16867404f11ff287cfff \
-    --hash=sha256:4169abc722fc9a957366c4fc8fdd7a927a5fb890ec0aae5178011e41c45a560e \
-    --hash=sha256:aa6e9d9e4c7e276409f99b83d964fa39c7ba567b5521244b6b1a1eaf6ec399b9 \
-    --hash=sha256:bdac6feeaa8aa45fd88dc650a9430a104ac4850aacba73e95138f4338e06ddfd \
-    --hash=sha256:da29dfd8182e67357aa45c1734dca03aabfbeaa2339f06a97fcd26f24c4827bf \
-    --hash=sha256:fb69cf1d5bb350aa63a797b8d1b660ff1d8ea281358558ec602f7bce6b051380
+pyrefly==0.57.1 \
+    --hash=sha256:02ad59ea722191f51635f23e37574662116b82ca9d814529f7cb5528f041f381 \
+    --hash=sha256:0b01f454fa5539e070c0cba17ddec46b3d2107d571d519bd8eca8f3142ba02a6 \
+    --hash=sha256:468e5839144b25bb0dce839bfc5fd879c9f38e68ebf5de561f30bed9ae19d8ca \
+    --hash=sha256:46db9c97093673c4fb7fab96d610e74d140661d54688a92d8e75ad885a56c141 \
+    --hash=sha256:54bc0afe56776145e37733ff763e7e9679ee8a76c467b617dc3f227d4124a9e2 \
+    --hash=sha256:808087298537c70f5e7cdccb5bbaad482e7e056e947c0adf00fb612cbace9fdc \
+    --hash=sha256:91974bfbe951eebf5a7bc959c1f3921f0371c789cad84761511d695e9ab2265f \
+    --hash=sha256:b05f6f5ee3a6a5d502ca19d84cb9ab62d67f05083819964a48c1510f2993efc6 \
+    --hash=sha256:feb1bbe3b0d8d5a70121dcdf1476e6a99cc056a26a49379a156f040729244dcb
     # via -r requirements/uvx-tools.txt
 pyright==1.1.408 \
     --hash=sha256:090b32865f4fdb1e0e6cd82bf5618480d48eecd2eb2e70f960982a3d9a4c17c1 \
@@ -110,24 +110,24 @@ twine==6.2.0 \
     --hash=sha256:418ebf08ccda9a8caaebe414433b0ba5e25eb5e4a927667122fbe8f829f985d8 \
     --hash=sha256:e5ed0d2fd70c9959770dce51c8f39c8945c574e18173a7b81802dab51b4b75cf
     # via -r requirements/uvx-tools.txt
-ty==0.0.23 \
-    --hash=sha256:1e137e955f05c501cfbb81dd2190c8fb7d01ec037c7e287024129c722a83c9ad \
-    --hash=sha256:252539c3fcd7aeb9b8d5c14e2040682c3e1d7ff640906d63fd2c4ce35865a4ba \
-    --hash=sha256:32a7b8a14a98e1d20a9d8d2af23637ed7efdb297ac1fa2450b8e465d05b94482 \
-    --hash=sha256:341441783e626eeb7b1ec2160432956aed5734932ab2d1c26f94d0c98b229937 \
-    --hash=sha256:4a0bf086ec8e2197b7ea7ebfcf4be36cb6a52b235f8be61647ef1b2d99d6ffd3 \
-    --hash=sha256:51b591d19eef23bbc3807aef77d38fa1f003c354e1da908aa80ea2dca0993f77 \
-    --hash=sha256:559d9a299df793cb7a7902caed5eda8a720ff69164c31c979673e928f02251ee \
-    --hash=sha256:5fb05db58f202af366f80ef70f806e48f5237807fe424ec787c9f289e3f3a4ef \
-    --hash=sha256:6f803b9b9cca87af793467973b9abdd4b83e6b96d9b5e749d662cff7ead70b6d \
-    --hash=sha256:8ce1dc66c26d4167e2c78d12fa870ef5a7ec9cc344d2baaa6243297cfa88bd52 \
-    --hash=sha256:a0399bd13fd2cd6683fd0a2d59b9355155d46546d8203e152c556ddbdeb20842 \
-    --hash=sha256:bae1e7a294bf8528836f7617dc5c360ea2dddb63789fc9471ae6753534adca05 \
-    --hash=sha256:bd6a340969577b4645f231572c4e46012acba2d10d4c0c6570fe1ab74e76ae00 \
-    --hash=sha256:d28384e48ca03b34e4e2beee0e230c39bbfb68994bb44927fec61ef3642900da \
-    --hash=sha256:d2b162768764d9dc177c83fb497a51532bb67cbebe57b8fa0f2668436bf53f3c \
-    --hash=sha256:e43d36bd89a151ddcad01acaeff7dcc507cb73ff164c1878d2d11549d39a061c \
-    --hash=sha256:e810eef1a5f1cfc0731a58af8d2f334906a96835829767aed00026f1334a8dd7
+ty==0.0.24 \
+    --hash=sha256:0c94c25d0500939fd5f8f16ce41cbed5b20528702c1d649bf80300253813f0a2 \
+    --hash=sha256:1ab4f1f61334d533a3fdf5d9772b51b1300ac5da4f3cdb0be9657a3ccb2ce3e7 \
+    --hash=sha256:280a3d31e86d0721947238f17030c33f0911cae851d108ea9f4e3ab12a5ed01f \
+    --hash=sha256:438ecbf1608a9b16dd84502f3f1b23ef2ef32bbd0ab3e0ca5a82f0e0d1cd41ea \
+    --hash=sha256:5674a1146d927ab77ff198a88e0c4505134ced342a0e7d1beb4a076a728b7496 \
+    --hash=sha256:748a60eb6912d1cf27aaab105ffadb6f4d2e458a3fcadfbd3cf26db0d8062eeb \
+    --hash=sha256:7981df5c709c054da4ac5d7c93f8feb8f45e69e829e4461df4d5f0988fe67d04 \
+    --hash=sha256:83013fb3a4764a8f8bcc6ca11ff8bdfd8c5f719fc249241cb2b8916e80778eb1 \
+    --hash=sha256:89cbe7bc7df0fab02dbd8cda79b737df83f1ef7fb573b08c0ee043dc68cffb08 \
+    --hash=sha256:9fe42f6b98207bdaef51f71487d6d087f2cb02555ee3939884d779b2b3cc8bfc \
+    --hash=sha256:a52b7f589c3205512a9c50ba5b2b1e8c0698b72e51b8b9285c90420c06f1cae8 \
+    --hash=sha256:b2860151ad95a00d0f0280b8fef79900d08dcd63276b57e6e5774f2c055979c5 \
+    --hash=sha256:b6d2a3b6d4470c483552a31e9b368c86f154dcc964bccb5406159dc9cd362246 \
+    --hash=sha256:ba44512db5b97c3bbd59d93e11296e8548d0c9a3bdd1280de36d7ff22d351896 \
+    --hash=sha256:db2c5d269bcc9b764850c99f457b5018a79b3ef40ecfbc03344e65effd6cf743 \
+    --hash=sha256:ddeed3098dd92a83964e7aa7b41e509ba3530eb539fc4cd8322ff64a09daf1f5 \
+    --hash=sha256:facbf2c4aaa6985229e08f8f9bf152215eb078212f22b5c2411f35386688ab42
     # via -r requirements/uvx-tools.txt
 typecheck-runner==0.1.6 \
     --hash=sha256:a97f7ce67bf6397fe0e0e4072c1813a8961dc8e8233d0745d2702c29cd61e88d \