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

clobber pyodide packages with pip packages in freeze #172

Merged
merged 12 commits into from
Jan 13, 2025

Conversation

bollwyvl
Copy link
Contributor

@bollwyvl bollwyvl commented Jan 3, 2025

references

changes

  • only add packages from pyodide-lock.json if they were not overloaded by some pip mechanism
  • parametrize test_freeze_lockfile_compat over a package name and expected depeds, add pytest

@hoodmane
Copy link
Member

hoodmane commented Jan 6, 2025

Can you give example values for pyodide_packages and pip_packages where the old code was wrong?

@bollwyvl
Copy link
Contributor Author

bollwyvl commented Jan 6, 2025 via email

@bollwyvl bollwyvl marked this pull request as ready for review January 11, 2025 17:54
["snowballstemmer", set()],
],
)
def test_freeze_lockfile_compat(
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

bollwyvl added a commit to bollwyvl/micropip that referenced this pull request Jan 11, 2025
Copy link
Member

@ryanking13 ryanking13 left a comment

Choose a reason for hiding this comment

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

Thanks. It looks good to me in general.

@hoodmane Anything you want to comment?

Copy link
Member

@hoodmane hoodmane left a comment

Choose a reason for hiding this comment

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

Thanks @bollwyvl!

@hoodmane hoodmane merged commit d74f7a5 into pyodide:main Jan 13, 2025
6 checks passed
@bollwyvl
Copy link
Contributor Author

bollwyvl commented Jan 13, 2025 via email

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.

micropip.freeze fails when a pypi package would clobber a bundled pyodide package
4 participants