diff --git a/.copier-answers.yaml b/.copier-answers.yaml index d5bd528..460fefe 100644 --- a/.copier-answers.yaml +++ b/.copier-answers.yaml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: 7e5612d +_commit: 4d4d95a _src_path: https://github.com/python-project-templates/base.git add_docs: true add_extension: python diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 695960c..599d1f8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -55,7 +55,7 @@ jobs: run: make coverage - name: Upload test results (Python) - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: test-results-${{ matrix.os }}-${{ matrix.python-version }} path: junit.xml @@ -74,7 +74,7 @@ jobs: - name: Make dist run: make dist - - uses: actions/upload-artifact@v6 + - uses: actions/upload-artifact@v7 with: name: dist-${{matrix.os}} path: dist diff --git a/.gitignore b/.gitignore index 81e8bf5..4e6a474 100644 --- a/.gitignore +++ b/.gitignore @@ -141,14 +141,12 @@ js/node_modules js/test-results js/playwright-report js/*.tgz -check_dist/extension # Jupyter .ipynb_checkpoints .autoversion Untitled*.ipynb -!check_dist/extension/check_dist.json -!check_dist/extension/install.json +check_dist/extension check_dist/nbextension check_dist/labextension @@ -157,3 +155,7 @@ check_dist/labextension # Rust target + +# Hydra +outputs/ +multirun/ diff --git a/Makefile b/Makefile index 95507a7..8f84909 100644 --- a/Makefile +++ b/Makefile @@ -46,11 +46,22 @@ format: fix ################ # Other Checks # ################ +<<<<<<< before updating .PHONY: check-dist checks check check-dist: ## check python sdist with check-dist check-dist -v +======= +.PHONY: check-dist check-types checks check + +check-dist: ## check python sdist and wheel with check-dist + check-dist -v + +check-types: ## check python types with ty + ty check --python $$(which python) + +>>>>>>> after updating checks: check-dist # Alias diff --git a/pyproject.toml b/pyproject.toml index d0062be..355c357 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,9 +38,14 @@ dependencies = [ develop = [ "build", "bump-my-version", +<<<<<<< before updating "codespell>=2.4,<2.5", +======= + "check-dist", + "codespell", +>>>>>>> after updating "hatchling", - "mdformat>=0.7.22,<1.1", + "mdformat", "mdformat-tables>=1", "pytest", "pytest-cov", @@ -74,6 +79,7 @@ filename = "pyproject.toml" search = 'version = "{current_version}"' replace = 'version = "{new_version}"' +<<<<<<< before updating [tool.check-dist] present = [ "check_dist", @@ -107,11 +113,14 @@ absent = [ ] +======= +>>>>>>> after updating [tool.coverage.run] branch = true omit = [ "check_dist/tests/integration/", ] + [tool.coverage.report] exclude_also = [ "raise NotImplementedError",