diff --git a/.copier-answers.yaml b/.copier-answers.yaml index 2fd7485..a42b692 100644 --- a/.copier-answers.yaml +++ b/.copier-answers.yaml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: 84508d6 +_commit: 2f83523 _src_path: https://github.com/python-project-templates/base.git add_docs: true add_extension: python diff --git a/.gitignore b/.gitignore index 8b2e921..1957a53 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,10 @@ __pycache__/ *.exp *.lib +# vcpkg +vcpkg/ +vcpkg_installed/ + # Rust target target-capi @@ -142,6 +146,7 @@ hatch_multi/labextension # Emscripten SDK (locally installed) emsdk +.pyodide_build/ # Mac .DS_Store diff --git a/Makefile b/Makefile index b1506b6..ca34c97 100644 --- a/Makefile +++ b/Makefile @@ -7,9 +7,7 @@ develop: ## install dependencies and build library uv pip install -e .[develop] requirements: ## install prerequisite python build requirements - python -m pip install --upgrade pip toml - python -m pip install `python -c 'import toml; c = toml.load("pyproject.toml"); print("\n".join(c["build-system"]["requires"]))'` - python -m pip install `python -c 'import toml; c = toml.load("pyproject.toml"); print(" ".join(c["project"]["optional-dependencies"]["develop"]))'` + uv pip install -r pyproject.toml --extra develop build: ## build the python library python -m build -n diff --git a/hatch_multi/tests/test_projects_basic.py b/hatch_multi/tests/test_projects_basic.py index e5ace88..fac2f47 100644 --- a/hatch_multi/tests/test_projects_basic.py +++ b/hatch_multi/tests/test_projects_basic.py @@ -32,7 +32,7 @@ def test_basic(): zip_ref.extractall(f"hatch_multi/tests/{project}/dist/extracted") assert ( Path(f"hatch_multi/tests/{project}/dist/extracted").joinpath("hatch_cpp_test_project_basic-0.1.0.dist-info/METADATA").read_text() - == """Metadata-Version: 2.4 + == """Metadata-Version: 2.5 Name: hatch-cpp-test-project-basic Version: 0.1.0 Dynamic: Requires-Dist @@ -63,7 +63,7 @@ def test_basic(): zip_ref.extractall(f"hatch_multi/tests/{project}/dist/extracted") assert ( Path(f"hatch_multi/tests/{project}/dist/extracted").joinpath("hatch_cpp_test_project_basic-0.1.0.dist-info/METADATA").read_text() - == """Metadata-Version: 2.4 + == """Metadata-Version: 2.5 Name: hatch-cpp-test-project-basic Version: 0.1.0 Summary: Basic test project for hatch-cpp @@ -95,7 +95,7 @@ def test_basic(): zip_ref.extractall(f"hatch_multi/tests/{project}/dist/extracted") assert ( Path(f"hatch_multi/tests/{project}/dist/extracted").joinpath("hatch_cpp_test_project_basic_other-0.1.0.dist-info/METADATA").read_text() - == """Metadata-Version: 2.4 + == """Metadata-Version: 2.5 Name: hatch-cpp-test-project-basic-other Version: 0.1.0 Summary: Basic test project for hatch-cpp diff --git a/hatch_multi/tests/test_projects_multiple_primary.py b/hatch_multi/tests/test_projects_multiple_primary.py index 99a1f0d..4a6110e 100644 --- a/hatch_multi/tests/test_projects_multiple_primary.py +++ b/hatch_multi/tests/test_projects_multiple_primary.py @@ -31,7 +31,7 @@ def test_project_basic_multiple_primary(): zip_ref.extractall(f"hatch_multi/tests/{project}/dist/extracted") assert ( Path(f"hatch_multi/tests/{project}/dist/extracted").joinpath("hatch_cpp_test_project_basic-0.1.0.dist-info/METADATA").read_text() - == """Metadata-Version: 2.4 + == """Metadata-Version: 2.5 Name: hatch-cpp-test-project-basic Version: 0.1.0 Dynamic: Requires-Dist @@ -62,7 +62,7 @@ def test_project_basic_multiple_primary(): zip_ref.extractall(f"hatch_multi/tests/{project}/dist/extracted") assert ( Path(f"hatch_multi/tests/{project}/dist/extracted").joinpath("hatch_cpp_test_project_basic-0.1.0.dist-info/METADATA").read_text() - == """Metadata-Version: 2.4 + == """Metadata-Version: 2.5 Name: hatch-cpp-test-project-basic Version: 0.1.0 Summary: Basic test project for hatch-cpp @@ -95,7 +95,7 @@ def test_project_basic_multiple_primary(): zip_ref.extractall(f"hatch_multi/tests/{project}/dist/extracted") assert ( Path(f"hatch_multi/tests/{project}/dist/extracted").joinpath("hatch_cpp_test_project_basic_other-0.1.0.dist-info/METADATA").read_text() - == """Metadata-Version: 2.4 + == """Metadata-Version: 2.5 Name: hatch-cpp-test-project-basic-other Version: 0.1.0 Summary: Basic test project for hatch-cpp