Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .copier-answers.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Changes here will be overwritten by Copier
_commit: 37f89c1
_commit: 3160d4c
_src_path: https://github.com/python-project-templates/base.git
add_docs: false
add_extension: rustjswasm
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,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'
Expand All @@ -83,7 +83,7 @@ jobs:
token: ${{ secrets.CODECOV_TOKEN }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
uses: docker/setup-qemu-action@v4
with:
platforms: all
if: runner.os == 'Linux' && runner.arch == 'X64'
Expand All @@ -106,7 +106,7 @@ jobs:
CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=11.0
if: matrix.os != 'ubuntu-latest'

- uses: actions/upload-artifact@v6
- uses: actions/upload-artifact@v7
with:
name: dist-${{matrix.os}}
path: dist
36 changes: 12 additions & 24 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ __pycache__/
*.exp
*.lib

# Rust
target

# Distribution / packaging
.Python
build/
Expand Down Expand Up @@ -55,26 +58,12 @@ junit.xml
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

# Django stuff:
# Django
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# PyBuilder
target/

# IPython
profile_default/
ipython_config.py
Expand All @@ -85,15 +74,12 @@ ipython_config.py
# pipenv
Pipfile.lock

# PEP 582; used by e.g. github.com/David-OConnor/pyflow
__pypackages__/

# Celery stuff
# Celery
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py
# Airspeed Velocity
.asv

# Environments
.env
Expand Down Expand Up @@ -141,14 +127,12 @@ js/node_modules
js/test-results
js/playwright-report
js/*.tgz
zarc/extension

# Jupyter
.ipynb_checkpoints
.autoversion
Untitled*.ipynb
!zarc/extension/zarc.json
!zarc/extension/install.json
zarc/extension
zarc/nbextension
zarc/labextension

Expand All @@ -157,3 +141,7 @@ zarc/labextension

# Rust
target

# Hydra
outputs/
multirun/
69 changes: 18 additions & 51 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ publish = false

[lib]
name = "zarc"
path = "src/lib.rs"
path = "rust/python/lib.rs"
crate-type = ["cdylib"]

[dependencies]
zarc = { path = "./rust", version = "*" }
pyo3 = { version = "0.27.1", features = ["abi3-py39", "extension-module", "multiple-pymethods"] }
pyo3 = { version = "0.28.2", features = ["abi3", "extension-module", "multiple-pymethods"] }

[profile.release]
panic = 'abort'
Expand Down
11 changes: 7 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,15 @@ format: fix
################
# Other Checks #
################
.PHONY: check-manifest checks check
.PHONY: check-dist check-types checks check

check-manifest: ## check python sdist manifest with check-manifest
check-manifest -v
check-dist: ## check python sdist and wheel with check-dist
check-dist -v

checks: check-manifest
check-types: ## check python types with ty
ty check --python $$(which python)

checks: check-dist

# alias
check: checks
Expand Down
2 changes: 1 addition & 1 deletion js/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ crate-type = ["cdylib"]

[dependencies]
zarc = { path = "../rust", version = "*" }
wasm-bindgen = "0.2.108"
wasm-bindgen = "0.2.114"
6 changes: 3 additions & 3 deletions js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"access": "public"
},
"scripts": {
"setup": "cargo install -f wasm-bindgen-cli --version 0.2.108",
"setup": "cargo install -f wasm-bindgen-cli --version 0.2.114",
"build:debug": "node build.mjs --debug",
"build:rust": "cargo build --release --all-features --target wasm32-unknown-unknown",
"build:wasm-bindgen": "wasm-bindgen ../target/wasm32-unknown-unknown/release/zarc.wasm --out-dir ./dist/pkg --target web",
Expand Down Expand Up @@ -55,12 +55,12 @@
"@playwright/test": "^1.56.1",
"@prospective.co/procss": "^0.1.17",
"cpy": "^12.1.0",
"esbuild": "^0.27.0",
"esbuild": "^0.27.2",
"esbuild-plugin-less": "^1.3.35",
"http-server": "^14.1.1",
"nodemon": "^3.1.10",
"npm-run-all": "^4.1.5",
"prettier": "^3.7.4",
"prettier": "^3.8.1",
"typescript": "^5.9.3"
}
}
12 changes: 6 additions & 6 deletions js/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading