Skip to content

Unvendor pyodide-build#4882

Merged
ryanking13 merged 33 commits intopyodide:mainfrom
ryanking13:unvendor-build
Jul 26, 2024
Merged

Unvendor pyodide-build#4882
ryanking13 merged 33 commits intopyodide:mainfrom
ryanking13:unvendor-build

Conversation

@ryanking13
Copy link
Member

@ryanking13 ryanking13 commented Jun 23, 2024

Description

pyodide-build now lives in pyodide/pyodide-build.

After this change,

  1. pyodide-build will have separate version numbers from Pyodide runtime. Actually, I just released pyodide-build 0.27, so it is already separated
  2. If some change needs to be applied both in pyodide runtime and pyodide-build, it will be a little more uncomfortable. One should bump up pyodide-build first, and then update pyodide runtime. I've worked to loosen the connection between the two as much as possible to prevent this from happening, but as always, it can happen.

@ryanking13
Copy link
Member Author

This is ready to be reviewed now.

Makefile.envs Outdated
export PYODIDE_EMSCRIPTEN_VERSION ?= 3.1.58
export PYODIDE_VERSION ?= 0.27.0.dev0
export PYODIDE_ABI_VERSION ?= 2024_0
export PYODIDE_BUILD_VERSION ?= 0.27.3
Copy link
Member

Choose a reason for hiding this comment

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

I wonder if we should add optional PYODIDE_BUILD_REPO and PYODIDE_BUILD_COMMIT -- if these are defined, we can check in the pyodide_build rule that direct_url.json exists and has appropriate contents. Then perhaps we should install pyodide_build everywhere with make pyodide_build...?

Copy link
Member Author

@ryanking13 ryanking13 Jul 19, 2024

Choose a reason for hiding this comment

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

Sounds reasonable to me. Let me see if I can make it work.

--verbose \
--runtime=host \
--cov=pyodide_build --cov=pyodide \
src pyodide-build packages/micropip/ packages/_tests tools/
Copy link
Member

Choose a reason for hiding this comment

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

Is there a reason you deleted packages/micropip and packages/_tests here?

Copy link
Member Author

Choose a reason for hiding this comment

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

I put back packages/_tests. packages/micropip is not needed as there is no host test in micropip anyway.

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!

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