Skip to content

Conversation

tpambor
Copy link
Contributor

@tpambor tpambor commented Jul 20, 2025

Add back tomli to the requirements-actions.txt as it is still used by some dependencies.

Fixes west command tests as mypy depends on tomli and the version was now no longer pinned as of #92563.

Add back tomli to the requirements-actions.txt as it is still used by
some dependencies.

Signed-off-by: Tim Pambor <[email protected]>
kartben
kartben previously approved these changes Jul 20, 2025
fabiobaltieri
fabiobaltieri previously approved these changes Jul 20, 2025
Copy link
Member

@nashif nashif left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wait, this need to be added to scripts/requirements-actions.in

@tpambor
Copy link
Contributor Author

tpambor commented Jul 20, 2025

wait, this need to be added to scripts/requirements-actions.in

We removed it from there and no longer directly depend on it, so I think no need to add it there again.

See also, #92563 (comment)

It should still be removed from the .in file though, to clarify that we don't directly require it, so maybe it shouldn't be a plain revert.

Error currently happening in CI without this fix: https://github.com/zephyrproject-rtos/zephyr/actions/runs/16398172303/job/46333698919?pr=93378

@nashif
Copy link
Member

nashif commented Jul 20, 2025

ok, not sure how this happend, because if I generare the txt file now, I also get mock added.

--- a/scripts/requirements-actions.txt
+++ b/scripts/requirements-actions.txt
@@ -653,6 +653,10 @@ mccabe==0.7.0 \
     --hash=sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325 \
     --hash=sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e
     # via pylint
+mock==5.2.0 \
+    --hash=sha256:4e460e818629b4b173f32d08bf30d3af8123afbb8e04bb5707a1fd4799e503f0 \
+    --hash=sha256:7ba87f72ca0e915175596069dbbcc7c75af7b5e9b9bc107ad6349ede0819982f
+    # via -r requirements-actions.in
 msgpack==1.1.1 ; sys_platform != 'win32' \
     --hash=sha256:196a736f0526a03653d829d7d4c5500a97eea3648aebfd4b6743875f28aa2af8 \
     --hash=sha256:1abfc6e949b352dadf4bce0eb78023212ec5ac42f6abfd469ce91d783c149c2a \
@@ -1174,6 +1178,45 @@ tabulate==0.9.0 \
     --hash=sha256:0095b12bf5966de529c0feb1fa08671671b3368eec77d7ef7ab114be2c068b3c \
     --hash=sha256:024ca478df22e9340661486f85298cff5f6dcdba14f3813e8830015b9ed1948f
     # via -r requirements-actions.in
+tomli==2.2.1 ; python_full_version < '3.11' \
+    --hash=sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6 \
+    --hash=sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd \
+    --hash=sha256:286f0ca2ffeeb5b9bd4fcc8d6c330534323ec51b2f52da063b11c502da16f30c \
+    --hash=sha256:2d0f2fdd22b02c6d81637a3c95f8cd77f995846af7414c5c4b8d0545afa1bc4b \
+    --hash=sha256:33580bccab0338d00994d7f16f4c4ec25b776af3ffaac1ed74e0b3fc95e885a8 \
+    --hash=sha256:400e720fe168c0f8521520190686ef8ef033fb19fc493da09779e592861b78c6 \
+    --hash=sha256:40741994320b232529c802f8bc86da4e1aa9f413db394617b9a256ae0f9a7f77 \
+    --hash=sha256:465af0e0875402f1d226519c9904f37254b3045fc5084697cefb9bdde1ff99ff \
+    --hash=sha256:4a8f6e44de52d5e6c657c9fe83b562f5f4256d8ebbfe4ff922c495620a7f6cea \
+    --hash=sha256:4e340144ad7ae1533cb897d406382b4b6fede8890a03738ff1683af800d54192 \
+    --hash=sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249 \
+    --hash=sha256:6972ca9c9cc9f0acaa56a8ca1ff51e7af152a9f87fb64623e31d5c83700080ee \
+    --hash=sha256:7fc04e92e1d624a4a63c76474610238576942d6b8950a2d7f908a340494e67e4 \
+    --hash=sha256:889f80ef92701b9dbb224e49ec87c645ce5df3fa2cc548664eb8a25e03127a98 \
+    --hash=sha256:8d57ca8095a641b8237d5b079147646153d22552f1c637fd3ba7f4b0b29167a8 \
+    --hash=sha256:8dd28b3e155b80f4d54beb40a441d366adcfe740969820caf156c019fb5c7ec4 \
+    --hash=sha256:9316dc65bed1684c9a98ee68759ceaed29d229e985297003e494aa825ebb0281 \
+    --hash=sha256:a198f10c4d1b1375d7687bc25294306e551bf1abfa4eace6650070a5c1ae2744 \
+    --hash=sha256:a38aa0308e754b0e3c67e344754dff64999ff9b513e691d0e786265c93583c69 \
+    --hash=sha256:a92ef1a44547e894e2a17d24e7557a5e85a9e1d0048b0b5e7541f76c5032cb13 \
+    --hash=sha256:ac065718db92ca818f8d6141b5f66369833d4a80a9d74435a268c52bdfa73140 \
+    --hash=sha256:b82ebccc8c8a36f2094e969560a1b836758481f3dc360ce9a3277c65f374285e \
+    --hash=sha256:c954d2250168d28797dd4e3ac5cf812a406cd5a92674ee4c8f123c889786aa8e \
+    --hash=sha256:cb55c73c5f4408779d0cf3eef9f762b9c9f147a77de7b258bef0a5628adc85cc \
+    --hash=sha256:cd45e1dc79c835ce60f7404ec8119f2eb06d38b1deba146f07ced3bbc44505ff \
+    --hash=sha256:d3f5614314d758649ab2ab3a62d4f2004c825922f9e370b29416484086b264ec \
+    --hash=sha256:d920f33822747519673ee656a4b6ac33e382eca9d331c87770faa3eef562aeb2 \
+    --hash=sha256:db2b95f9de79181805df90bedc5a5ab4c165e6ec3fe99f970d0e302f384ad222 \
+    --hash=sha256:e59e304978767a54663af13c07b3d1af22ddee3bb2fb0618ca1593e4f593a106 \
+    --hash=sha256:e85e99945e688e32d5a35c1ff38ed0b3f41f43fad8df0bdf79f72b2ba7bc5272 \
+    --hash=sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a \
+    --hash=sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7
+    # via
+    #   mypy
+    #   pylint
+    #   pyproject-api
+    #   pytest
+    #   tox
 tomlkit==0.13.3 \
     --hash=sha256:430cf247ee57df2b94ee3fbe588e71d362a941ebb545dec29b53961d61add2a1 \
     --hash=sha256:c89c649d79ee40629a9fda55f8ace8c6a1b42deb912b2a8fd8d942ddadb606b0

@kartben
Copy link
Contributor

kartben commented Jul 20, 2025

@nashif are you sure you don't have a version of the .in file with mock in there? (See the #via... comment)
For tomli the only explanation I can find is a big oversight on my end, laziness as I probably removed the entry from the .txt file manually in an attempt to not have unnecessary merge conflicts (very very bad idea), and bad luck as CI didn't catch it in the PR itself.

@tpambor
Copy link
Contributor Author

tpambor commented Jul 20, 2025

ok, not sure how this happend, because if I generare the txt file now, I also get mock added.

mock was recently removed in edead76 from scripts/requirements-build-test.txt and ‎scripts/requirements-actions.txt but it is still present in scripts/requirements-actions.in.

This appears to have been an oversight.

@nashif
Copy link
Member

nashif commented Jul 20, 2025

@nashif are you sure you don't have a version of the .in file with mock in there?

it is there, but it should not?

@kartben
Copy link
Contributor

kartben commented Jul 20, 2025

@nashif are you sure you don't have a version of the .in file with mock in there?

it is there, but it should not?

Yeah, should not. Someone (me) likely screwed up a rebase...

Remove mock from requirements-actions.in as it is not needed anymore.

Signed-off-by: Tim Pambor <[email protected]>
@tpambor tpambor dismissed stale reviews from fabiobaltieri and kartben via 68ddde2 July 20, 2025 15:36
@tpambor
Copy link
Contributor Author

tpambor commented Jul 20, 2025

I pushed another commit removing mock from scripts/requirements-actions.in, so that scripts/requirements-actions.txt is correctly in sync again.

Copy link

@str4t0m
Copy link
Contributor

str4t0m commented Jul 21, 2025

Is there any objection to labeling this a hotfix? It's causing CI to fail for PR's like #93378

@stephanosio stephanosio added the Hotfix Fix for issues blocking development, i.e. CI issues, tests failing in CI, etc. label Jul 21, 2025
@nashif nashif merged commit 3d077c6 into zephyrproject-rtos:main Jul 21, 2025
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: Continuous Integration Hotfix Fix for issues blocking development, i.e. CI issues, tests failing in CI, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants