Skip to content

Commit 7887841

Browse files
committed
Reinit
1 parent 39c89f2 commit 7887841

File tree

9 files changed

+28
-285
lines changed

9 files changed

+28
-285
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: ca3e4a0
2+
_commit: 5a62651
33
_src_path: https://github.com/python-project-templates/base.git
44
add_docs: true
55
add_extension: rustjswasm

.github/workflows/build.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151

5252
- name: Lint
5353
run: make lint
54+
if: matrix.os == 'ubuntu-latest'
5455

5556
- name: Checks
5657
run: make checks
@@ -67,7 +68,7 @@ jobs:
6768
with:
6869
name: test-results-${{ matrix.os }}-${{ matrix.python-version }}
6970
path: '**/junit.xml'
70-
if: ${{ always() }}
71+
if: matrix.os == 'ubuntu-latest'
7172

7273
- name: Publish Unit Test Results
7374
uses: EnricoMi/publish-unit-test-result-action@v2

.github/workflows/docs.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
- uses: actions-ext/python/setup@main
1616
- uses: actions-ext/rust/setup@main
1717
- uses: actions-ext/node/setup@main
18+
- run: make develop
1819
- run: uv pip install .
1920
- run: uv pip install yardang
2021
- run: yardang build

.prettierignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

Cargo.lock

Lines changed: 0 additions & 253 deletions
This file was deleted.

js/.prettierignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

js/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@
3434
"build": "npm-run-all build:rust build:wasm-bindgen build:prod",
3535
"clean": "rm -rf dist lib playwright-report ../python_template_rust/extension",
3636
"dev": "npm-run-all -p start watch",
37-
"lint:js": "prettier --check \"src/**/*.{js,ts,jsx,tsx,less,css}\" \"tests/**/*\" \"*.mjs\" \"*.json\"",
37+
"lint:js": "prettier --check \"src/**/*.{js,ts,jsx,tsx,less,css}\" \"tests/**/*.{js,ts,jsx,tsx}\" \"*.mjs\" \"*.json\"",
3838
"lint:rust": "cargo clippy --all-features && cargo fmt --all -- --check",
3939
"lint": "npm-run-all lint:*",
40-
"fix:js": "prettier --write \"src/**/*.{js,ts,jsx,tsx}\" \"tests/**/*\" \"*.mjs\" \"*.json\"",
40+
"fix:js": "prettier --write \"src/**/*.{js,ts,jsx,tsx,less,css}\" \"tests/**/*.{js,ts,jsx,tsx}\" \"*.mjs\" \"*.json\"",
4141
"fix:rust": "cargo fmt --all",
4242
"fix": "npm-run-all fix:*",
4343
"preinstall": "npx only-allow pnpm",
4444
"prepack": "pnpm run build",
4545
"start": "http-server -p 3000 -o examples/",
4646
"start:tests": "http-server -p 3000 ",
47-
"test:js": "TZ=UTC playwright test",
47+
"test:js": "playwright test",
4848
"test:rust": "cargo test -- --show-output",
4949
"test": "npm-run-all test:rust test:js",
5050
"watch": "nodemon --watch src -e ts,less,html --exec \"pnpm build:debug\""

pyproject.toml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ develop = [
3535
"check-manifest",
3636
"cibuildwheel",
3737
"codespell>=2.4,<2.5",
38-
"hatch-jupyter-builder",
38+
"hatch-js",
39+
"hatch-rs",
3940
"hatchling",
4041
"mdformat>=0.7.22,<0.8",
4142
"mdformat-tables>=1",
@@ -105,7 +106,6 @@ ignore = [
105106
]
106107

107108
[tool.cibuildwheel]
108-
before-build = "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=minimal -y"
109109
build = "cp39-*"
110110
test-command = "pytest -vvv {project}/python_template_rust/tests"
111111
test-requires = ["pytest", "pytest-cov", "pytest-sugar", "pytest-xdist"]
@@ -116,27 +116,25 @@ curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=m
116116
rustup target add aarch64-unknown-linux-gnu
117117
rustup target add x86_64-unknown-linux-gnu
118118
rustup show
119+
120+
curl -sL https://rpm.nodesource.com/setup_20.x | bash -
121+
yum install nodejs -y
122+
node --version
123+
npm --version
124+
npm i -g pnpm
125+
which pnpm
126+
pnpm --help
127+
pnpm --version
119128
"""
120129
environment = {PATH="$HOME/.cargo/bin:$PATH", CARGO_TERM_COLOR="always"}
121130
skip = "*i686 musllinux*"
131+
manylinux-x86_64-image = "manylinux_2_28"
122132

123133
[tool.cibuildwheel.macos]
124-
before-build = """
125-
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=minimal -y
126-
rustup target add aarch64-apple-darwin
127-
rustup target add x86_64-apple-darwin
128-
rustup show
129-
"""
130134
environment = {PATH="$HOME/.cargo/bin:$PATH", CARGO_TERM_COLOR="always", MACOS_DEPLOYMENT_TARGET=11.0}
131135
archs = "arm64"
132136

133137
[tool.cibuildwheel.windows]
134-
before-build = """
135-
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=minimal -y
136-
rustup target add x86_64-pc-windows-msvc
137-
rustup target add aarch64-pc-windows-msvc
138-
rustup show
139-
"""
140138
environment = {PATH="$UserProfile\\.cargo\bin;$PATH", CARGO_TERM_COLOR="always"}
141139
skip = "*win32 *arm_64"
142140

0 commit comments

Comments
 (0)