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

Use hatch-vcs for versioning pyodide-build #4

Merged
merged 5 commits into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

## [0.27.0] - 2024/06/18

- pyodide-build is now developed under https://github.com/pyodide/pyodide-build.
7 changes: 6 additions & 1 deletion pyodide_build/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
__version__ = "0.27.0.dev0"
from importlib.metadata import PackageNotFoundError, version

try:
__version__ = version("pyodide-build")
except PackageNotFoundError:
__version__ = "1.0.0.dev0"
4 changes: 2 additions & 2 deletions pyodide_build/tests/test_build_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def test_get_build_environment_vars_host_env(
assert "RANDOM_ENV" not in e


def test_check_emscripten_version(monkeypatch):
def test_check_emscripten_version(dummy_xbuildenv, monkeypatch):
s = None

def get_emscripten_version_info():
Expand Down Expand Up @@ -179,7 +179,7 @@ def get_emscripten_version_info(): # type: ignore[no-redef]
build_env.check_emscripten_version()


def test_wheel_paths():
def test_wheel_paths(dummy_xbuildenv):
from pathlib import Path

old_version = "cp38"
Expand Down
2 changes: 1 addition & 1 deletion pyodide_build/tests/test_buildall.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def test_generate_dependency_graph_disabled():
assert set(pkg_map.keys()) == set()


def test_generate_lockfile(tmp_path):
def test_generate_lockfile(tmp_path, dummy_xbuildenv):
pkg_map = buildall.generate_dependency_graph(
RECIPE_DIR, {"pkg_1", "pkg_2", "libtest", "libtest_shared"}
)
Expand Down
5 changes: 2 additions & 3 deletions pyodide_build/tests/test_buildpkg.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import pydantic
import pytest

from pyodide_build import build_env, buildpkg, common
from pyodide_build.build_env import BuildArgs, get_pyodide_root
from pyodide_build import buildpkg, common
from pyodide_build.build_env import BuildArgs
from pyodide_build.buildpkg import RecipeBuilder
from pyodide_build.io import _SourceSpec

Expand Down Expand Up @@ -72,7 +72,6 @@ class subprocess_result:
returncode = 0
stdout = ""

build_env.get_build_environment_vars(get_pyodide_root())
monkeypatch.setattr(subprocess, "run", lambda *args, **kwargs: subprocess_result)
monkeypatch.setattr(buildpkg, "check_checksum", lambda *args, **kwargs: True)
monkeypatch.setattr(shutil, "unpack_archive", lambda *args, **kwargs: True)
Expand Down
8 changes: 4 additions & 4 deletions pyodide_build/tests/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def test_build_recipe_no_deps_continue(tmp_path, dummy_xbuildenv, mock_emscripte
assert f"{pkg}-{version}-py3-none-any.whl" in result.stdout


def test_config_list():
def test_config_list(dummy_xbuildenv):
result = runner.invoke(
config.app,
[
Expand All @@ -249,7 +249,7 @@ def test_config_list():


@pytest.mark.parametrize("cfg_name,env_var", config.PYODIDE_CONFIGS.items())
def test_config_get(cfg_name, env_var):
def test_config_get(cfg_name, env_var, dummy_xbuildenv):
result = runner.invoke(
config.app,
[
Expand Down Expand Up @@ -411,7 +411,7 @@ def my_get_config_vars(*args):
assert so_file.endswith(".cpython-311-wasm32-emscripten.so")


def test_build_exports(monkeypatch):
def test_build_exports(monkeypatch, dummy_xbuildenv):
def download_url_shim(url, tmppath):
(tmppath / "build").mkdir()
return "blah"
Expand Down Expand Up @@ -469,7 +469,7 @@ def run(*args):
)


def test_build_config_settings(monkeypatch):
def test_build_config_settings(monkeypatch, dummy_xbuildenv):
app = typer.Typer()

app.command(
Expand Down
8 changes: 7 additions & 1 deletion pyodide_build/xbuildenv.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import json
import shutil
import subprocess
import warnings
from pathlib import Path
from tempfile import NamedTemporaryFile
from urllib.request import urlopen
Expand Down Expand Up @@ -273,7 +274,12 @@ def _download(self, url: str, path: Path) -> None:
with NamedTemporaryFile(suffix=".tar") as f:
f_path = Path(f.name)
f_path.write_bytes(data)
shutil.unpack_archive(str(f_path), path)
with warnings.catch_warnings():
# Python 3.12-3.13 emits a DeprecationWarning when using shutil.unpack_archive without a filter,
# but filter doesn't work well for zip files, so we suppress the warning until we find a better solution.
# https://github.com/python/cpython/issues/112760
warnings.simplefilter("ignore")
shutil.unpack_archive(str(f_path), path)

def _install_cross_build_packages(
self, xbuildenv_root: Path, xbuildenv_pyodide_root: Path
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["hatchling"]
requires = ["hatchling", "hatch-vcs"]
build-backend = "hatchling.build"

[project]
Expand Down Expand Up @@ -66,8 +66,8 @@ test = [
"packaging",
]

[tool.hatch]
version.path = "pyodide_build/__init__.py"
[tool.hatch.version]
source = "vcs"

[tool.hatch.build.targets.sdist]
exclude = [
Expand Down
Loading