diff --git a/.copier-answers.yaml b/.copier-answers.yaml index 09f8696..fe6b670 100644 --- a/.copier-answers.yaml +++ b/.copier-answers.yaml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: ebb6e1c +_commit: '4372075' _src_path: https://github.com/python-project-templates/base.git add_docs: false add_extension: python diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2c837c4..10fee28 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -15,7 +15,7 @@ on: workflow_dispatch: concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true permissions: diff --git a/Makefile b/Makefile index 010d07a..e239e45 100644 --- a/Makefile +++ b/Makefile @@ -25,16 +25,16 @@ lint-py: ## lint python with ruff python -m ruff format --check hatch_go lint-docs: ## lint docs with mdformat and codespell - python -m mdformat --check README.md - python -m codespell_lib README.md + python -m mdformat --check README.md $(wildcard docs/src) + python -m codespell_lib README.md $(wildcard docs/src) fix-py: ## autoformat python code with ruff python -m ruff check --fix hatch_go python -m ruff format hatch_go fix-docs: ## autoformat docs with mdformat and codespell - python -m mdformat README.md - python -m codespell_lib --write README.md + python -m mdformat README.md $(wildcard docs/src) + python -m codespell_lib --write README.md $(wildcard docs/src) lint: lint-py lint-docs ## run all linters lints: lint @@ -44,12 +44,15 @@ format: fix ################ # Other Checks # ################ -.PHONY: check-manifest checks check +.PHONY: check-manifest check-types checks check check-manifest: ## check python sdist manifest with check-manifest check-manifest -v -checks: check-manifest +check-types: ## check python types with ty + ty check --python $$(which python) + +checks: check-manifest check-types # Alias check: checks diff --git a/hatch_go/tests/test_hook_registration.py b/hatch_go/tests/test_hook_registration.py index 7d4be68..3aeba93 100644 --- a/hatch_go/tests/test_hook_registration.py +++ b/hatch_go/tests/test_hook_registration.py @@ -1,4 +1,5 @@ from hatchling.builders.hooks.plugin.interface import BuildHookInterface +from hatchling.metadata.core import ProjectMetadata from hatch_go.hooks import hatch_register_build_hook @@ -10,7 +11,7 @@ def test_registered_build_hook_accepts_hatchling_configuration(tmp_path): root=str(tmp_path), config=config, build_config=None, - metadata=None, + metadata=ProjectMetadata(str(tmp_path), None, {"project": {"name": "project", "version": "0.1.0"}}), directory=str(tmp_path), target_name="wheel", ) diff --git a/hatch_go/tests/test_projects.py b/hatch_go/tests/test_projects.py index bdcf6d7..b38af5e 100644 --- a/hatch_go/tests/test_projects.py +++ b/hatch_go/tests/test_projects.py @@ -1,3 +1,4 @@ +from importlib import import_module from os import listdir from pathlib import Path from shutil import rmtree @@ -61,10 +62,10 @@ def test_basic(self, project_folder): here = Path(__file__).parent / project_folder path.insert(0, str(here)) try: - import project.project + project = import_module("project.project") - assert project.project.hello() == "A string from Go" - assert project.project.add(2, 3) == 5 - assert project.project.add(-1, 1) == 0 + assert project.hello() == "A string from Go" + assert project.add(2, 3) == 5 + assert project.add(-1, 1) == 0 finally: path.remove(str(here)) diff --git a/pyproject.toml b/pyproject.toml index 0996a3c..21acf4f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,6 +48,7 @@ develop = [ "codespell>=2.4,<2.5", "hatchling", "mdformat>=0.7.22,<1.1", + "mdformat-frontmatter", "mdformat-tables>=1", "pytest", "pytest-cov", @@ -91,7 +92,7 @@ ignore = [ [tool.coverage.run] branch = false omit = [ - "hatch_go/tests/integration/", + "hatch_go/tests/integration/*", ] [tool.coverage.report]