Skip to content

Commit 35097b9

Browse files
authored
Merge pull request #19 from python-project-templates/copier-update-2026-03-02T01-12-05
Update from copier (2026-03-02T01:12:05)
2 parents 6d75a93 + 762bf12 commit 35097b9

File tree

5 files changed

+23
-22
lines changed

5 files changed

+23
-22
lines changed

.copier-answers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Changes here will be overwritten by Copier
2-
_commit: 37f89c1
2+
_commit: 4d4d95a
33
_src_path: https://github.com/python-project-templates/base.git
44
add_docs: false
55
add_extension: python

.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
run: make coverage
6161

6262
- name: Upload test results (Python)
63-
uses: actions/upload-artifact@v6
63+
uses: actions/upload-artifact@v7
6464
with:
6565
name: test-results-${{ matrix.os }}-${{ matrix.python-version }}
6666
path: junit.xml
@@ -79,7 +79,7 @@ jobs:
7979
- name: Make dist
8080
run: make dist
8181

82-
- uses: actions/upload-artifact@v6
82+
- uses: actions/upload-artifact@v7
8383
with:
8484
name: dist-${{matrix.os}}
8585
path: dist

.gitignore

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,14 +141,12 @@ js/node_modules
141141
js/test-results
142142
js/playwright-report
143143
js/*.tgz
144-
hatch_js/extension
145144

146145
# Jupyter
147146
.ipynb_checkpoints
148147
.autoversion
149148
Untitled*.ipynb
150-
!hatch_js/extension/hatch_js.json
151-
!hatch_js/extension/install.json
149+
hatch_js/extension
152150
hatch_js/nbextension
153151
hatch_js/labextension
154152

@@ -158,7 +156,13 @@ hatch_js/labextension
158156
# Rust
159157
target
160158

159+
<<<<<<< before updating
161160
# Test parts
162161
hatch_js/tests/test_project_basic/js/dist
163162
hatch_js/tests/test_project_basic/js/node_modules
164163
hatch_js/tests/test_project_basic/project/extension
164+
=======
165+
# Hydra
166+
outputs/
167+
multirun/
168+
>>>>>>> after updating

Makefile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,15 @@ format: fix
4646
################
4747
# Other Checks #
4848
################
49-
.PHONY: check-manifest checks check
49+
.PHONY: check-dist check-types checks check
5050

51-
check-manifest: ## check python sdist manifest with check-manifest
52-
check-manifest -v
51+
check-dist: ## check python sdist and wheel with check-dist
52+
check-dist -v
5353

54-
checks: check-manifest
54+
check-types: ## check python types with ty
55+
ty check --python $$(which python)
56+
57+
checks: check-dist
5558

5659
# Alias
5760
check: checks

pyproject.toml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
requires = [
33
"hatchling",
44
]
5-
build-backend="hatchling.build"
5+
build-backend = "hatchling.build"
66

77
[project]
88
name = "hatch-js"
@@ -47,14 +47,14 @@ dependencies = [
4747
develop = [
4848
"build",
4949
"bump-my-version",
50-
"check-manifest",
51-
"codespell>=2.4,<2.5",
50+
"check-dist",
51+
"codespell",
5252
"hatchling",
53-
"mdformat>=0.7.22,<1.1",
53+
"mdformat",
5454
"mdformat-tables>=1",
5555
"pytest",
5656
"pytest-cov",
57-
"ruff>=0.9,<0.15",
57+
"ruff",
5858
"twine",
5959
"ty",
6060
"uv",
@@ -90,18 +90,12 @@ filename = "pyproject.toml"
9090
search = 'version = "{current_version}"'
9191
replace = 'version = "{new_version}"'
9292

93-
[tool.check-manifest]
94-
ignore = [
95-
".copier-answers.yaml",
96-
"Makefile",
97-
"docs/**/*",
98-
]
99-
10093
[tool.coverage.run]
10194
branch = false
10295
omit = [
10396
"hatch_js/tests/integration/",
10497
]
98+
10599
[tool.coverage.report]
106100
exclude_also = [
107101
"raise NotImplementedError",

0 commit comments

Comments
 (0)