From 7c771fa6333d45806c76ed6daa288e085c067a84 Mon Sep 17 00:00:00 2001 From: Gyeongjae Choi Date: Tue, 16 Jul 2024 22:09:20 +0900 Subject: [PATCH] Fix OOT incompatible recipes (#4937) --- packages/hashlib/src/pyproject.toml | 4 ++++ packages/lzma/src/pyproject.toml | 4 ++++ packages/pydecimal/src/pyproject.toml | 4 ++++ packages/pydoc_data/src/pyproject.toml | 4 ++++ packages/pygame-ce/test_pygame.py | 2 +- packages/sharedlib-test-py/meta.yaml | 4 ++-- packages/sqlite3/src/pyproject.toml | 4 ++++ packages/ssl/src/pyproject.toml | 4 ++++ packages/test/src/pyproject.toml | 4 ++++ 9 files changed, 31 insertions(+), 3 deletions(-) diff --git a/packages/hashlib/src/pyproject.toml b/packages/hashlib/src/pyproject.toml index a333b4b3e..8b4f1cbb4 100644 --- a/packages/hashlib/src/pyproject.toml +++ b/packages/hashlib/src/pyproject.toml @@ -10,7 +10,11 @@ version = "1.0.0" requires = ["hatchling"] build-backend = "hatchling.build" +[tool.hatch.build.targets.sdist] +ignore-vcs = true + [tool.hatch.build.targets.wheel] +ignore-vcs = true include = [ "_hashlib.so", ] diff --git a/packages/lzma/src/pyproject.toml b/packages/lzma/src/pyproject.toml index 3af36ebfd..f60f528d8 100644 --- a/packages/lzma/src/pyproject.toml +++ b/packages/lzma/src/pyproject.toml @@ -10,7 +10,11 @@ version = "1.0.0" requires = ["hatchling"] build-backend = "hatchling.build" +[tool.hatch.build.targets.sdist] +ignore-vcs = true + [tool.hatch.build.targets.wheel] +ignore-vcs = true include = [ "lzma.py", "_lzma.so", diff --git a/packages/pydecimal/src/pyproject.toml b/packages/pydecimal/src/pyproject.toml index 8e0a4a180..fa55b9639 100644 --- a/packages/pydecimal/src/pyproject.toml +++ b/packages/pydecimal/src/pyproject.toml @@ -10,7 +10,11 @@ version = "1.0.0" requires = ["hatchling"] build-backend = "hatchling.build" +[tool.hatch.build.targets.sdist] +ignore-vcs = true + [tool.hatch.build.targets.wheel] +ignore-vcs = true include = [ "_pydecimal.py", ] diff --git a/packages/pydoc_data/src/pyproject.toml b/packages/pydoc_data/src/pyproject.toml index 7909bc554..2e3023f6a 100644 --- a/packages/pydoc_data/src/pyproject.toml +++ b/packages/pydoc_data/src/pyproject.toml @@ -10,7 +10,11 @@ version = "1.0.0" requires = ["hatchling"] build-backend = "hatchling.build" +[tool.hatch.build.targets.sdist] +ignore-vcs = true + [tool.hatch.build.targets.wheel] +ignore-vcs = true include = [ "pydoc_data/", ] diff --git a/packages/pygame-ce/test_pygame.py b/packages/pygame-ce/test_pygame.py index 7c0d46299..bd1c9056c 100644 --- a/packages/pygame-ce/test_pygame.py +++ b/packages/pygame-ce/test_pygame.py @@ -38,7 +38,7 @@ def test_keyboard_input(): from auditwheel_emscripten import get_imports - dist_dir = Path(__file__).parent / "dist" + dist_dir = Path(pytest.pyodide_dist_dir) # type: ignore[attr-defined] wheel_path = next(dist_dir.glob("pygame_ce-*.whl")) assert wheel_path.exists() all_libs = get_imports(wheel_path) diff --git a/packages/sharedlib-test-py/meta.yaml b/packages/sharedlib-test-py/meta.yaml index a291a374a..83e5c15d8 100644 --- a/packages/sharedlib-test-py/meta.yaml +++ b/packages/sharedlib-test-py/meta.yaml @@ -19,6 +19,6 @@ build: echo PYTHONPATH: $PYTHONPATH echo _PYTHON_HOST_PLATFORM: $_PYTHON_HOST_PLATFORM cflags: | - -I$(PYODIDE_ROOT)/packages/sharedlib-test/src/include + -I$(PKGDIR)/../sharedlib-test/src/include ldflags: | - $(PYODIDE_ROOT)/packages/sharedlib-test/build/sharedlib-test-1.0/dist/sharedlib-test.so + $(PKGDIR)/../sharedlib-test/build/sharedlib-test-1.0/dist/sharedlib-test.so diff --git a/packages/sqlite3/src/pyproject.toml b/packages/sqlite3/src/pyproject.toml index db00563f7..1dc71961c 100644 --- a/packages/sqlite3/src/pyproject.toml +++ b/packages/sqlite3/src/pyproject.toml @@ -10,7 +10,11 @@ version = "1.0.0" requires = ["hatchling"] build-backend = "hatchling.build" +[tool.hatch.build.targets.sdist] +ignore-vcs = true + [tool.hatch.build.targets.wheel] +ignore-vcs = true include = [ "_sqlite3.so", "sqlite3/", diff --git a/packages/ssl/src/pyproject.toml b/packages/ssl/src/pyproject.toml index 7d6e3f8b5..a15673976 100644 --- a/packages/ssl/src/pyproject.toml +++ b/packages/ssl/src/pyproject.toml @@ -10,7 +10,11 @@ version = "1.0.0" requires = ["hatchling"] build-backend = "hatchling.build" +[tool.hatch.build.targets.sdist] +ignore-vcs = true + [tool.hatch.build.targets.wheel] +ignore-vcs = true include = [ "_ssl.so", "ssl.py", diff --git a/packages/test/src/pyproject.toml b/packages/test/src/pyproject.toml index 17ed3057b..300838082 100644 --- a/packages/test/src/pyproject.toml +++ b/packages/test/src/pyproject.toml @@ -10,7 +10,11 @@ version = "1.0.0" requires = ["hatchling"] build-backend = "hatchling.build" +[tool.hatch.build.targets.sdist] +ignore-vcs = true + [tool.hatch.build.targets.wheel] +ignore-vcs = true include = [ "_test*.so", "_ctypes_test.so",