Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Match CY/FireSim deps | Unpin deps | Update lockfiles #1391

Merged
merged 1 commit into from
Mar 9, 2023
Merged

Conversation

abejgonzalez
Copy link
Contributor

This sync's FireSim's conda environment with Chipyard and at the same time unpins Chipyard dependencies. This should help the solver resolve more often and faster.

Related PRs / Issues:

Type of change:

  • Bug fix
  • New feature
  • Other enhancement

Impact:

  • RTL change
  • Software change (RISC-V software)
  • Build system change
  • Other

Contributor Checklist:

  • Did you set main as the base branch?
  • Is this PR's title suitable for inclusion in the changelog and have you added a changelog:<topic> label?
  • Did you state the type-of-change/impact?
  • Did you delete any extraneous prints/debugging code?
  • Did you mark the PR with a changelog: label?
  • (If applicable) Did you update the conda .conda-lock.yml file if you updated the conda requirements file?
  • (If applicable) Did you add documentation for the feature?
  • (If applicable) Did you add a test demonstrating the PR?
  • (If applicable) Did you mark the PR as Please Backport?

- doit>=0.34.0
- gitpython
- humanfriendly
- e2fsprogs
Copy link
Member

Choose a reason for hiding this comment

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

Should we perhaps merge #1376 prior to this or combine them in a single PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

e2fsprogs will be removed when the Linux bump happens so lets hold off on that for now.

@abejgonzalez
Copy link
Contributor Author

I got offline approval from @jerryz123. Merging now.

@abejgonzalez abejgonzalez merged commit 5f21538 into main Mar 9, 2023
@abejgonzalez abejgonzalez deleted the unpin branch April 20, 2023 20:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants