[dvsim] Bump dvsim requirement to version 1.49.12#30620
Conversation
| dvsim==1.34.1 \ | ||
| --hash=sha256:13cee7d7d05efb80f327c5c9db7a18bd7b16a7db7c2011dbf0ff72041bb53dda \ | ||
| --hash=sha256:592ffafa4375d2ef3f67cfdd234f4b7ae185c560189f4202e07e616b93109282 | ||
| dvsim==1.49.12 \ |
There was a problem hiding this comment.
I think you want to update the dependency in pyproject.toml, since this file is generated.
Otherwise, the next time someone changes a Python dependency the version will be downgraded again.
There was a problem hiding this comment.
Thank you for pointing that out. I hope now it is ok.
There was a problem hiding this comment.
Sorry - to be clear, I think after changing it in pyproject.toml (as you have), you need to run ./util/sh/scripts/gen-python-requirements.sh to regenerate the python-requirements.txt file.
There was a problem hiding this comment.
Sorry for all the mess. I ran the script and pushed again but CI is still failing. Not sure if it related to this change.
There was a problem hiding this comment.
No worries. The CI failure is still related to this change - I had forgotten about this additional step.
You have now updated the Python dependencies, but Bazel has a lockfile and we haven't told Bazel itself that we want to add/update these Python dependencies. To regenerate the lockfile, you need to run one more command:
./bazelisk.sh mod depsHopefully that's the last change needed to make CI happy 😅
There was a problem hiding this comment.
Thanks, so far looks a little happier:)
There was a problem hiding this comment.
@rswarbrick I know you refactored & improved some of the testplan code in DVSim. With this version bump, we pull in your improvements and now Private CI is failing on the Darjeeling configuration because of duplicate items in the testplan:
https://github.com/lowRISC/opentitan-private-ci/actions/runs/28666658279/job/85019992031#step:5:296
Indeed, if I look through hw/top_darjeeling/data/chip_conn_testplan.hjson I can see at least the clkmgr_clk_io_infra item being duplicated. This is probably a good error to catch, but also means we can't bump the version 😅
Do you think this is the kind of thing you could quickly look into & resolve? I suspect things might just need to be renamed or jigged around a bit.
There was a problem hiding this comment.
Hopefully fixing the issues with this PR: #30669
When that is merged you should be able to rebase and resolve the CI problems.
There was a problem hiding this comment.
@sha-ron The above PR is merged now, can you try rebasing on the latest master? I'm hoping that should fix the remaining issues. It looks like another dependency was changed in the meantime so you'll need to regenerate the Bazel lockfile with ./bazelisk.sh mod deps again - it might even be easier to just reconstruct the changes on the latest master, given they're quite small.
sha-ron
force-pushed
the
python_req
branch
2 times, most recently
from
df4b6d8 to
7f82aae
Compare
Signed-off-by: Sharon Topaz <sharon.topaz@nuvoton.com> [dvsim] updating the correct file Signed-off-by: Sharon Topaz <sharon.topaz@nuvoton.com> [dvsim] auto generate python-requirements.txt file Signed-off-by: Sharon Topaz <sharon.topaz@nuvoton.com> [dvsim] Generate lock file Signed-off-by: Sharon Topaz <sharon.topaz@nuvoton.com>
2 participants
This increases the dvsim dependency from 1.34.1 to 1.49.12.