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 .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# passing tests baked in; published to GHCR by publish-image.yml.

# ---- dev: the toolchain a contributor needs --------------------------------
FROM mcr.microsoft.com/devcontainers/python:3.12 AS dev
FROM mcr.microsoft.com/devcontainers/python:3.15 AS dev
USER vscode
# No toolchain yet: the first cargo call in the repo installs the version in
# rust-toolchain.toml.
Expand Down
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Setup

Development uses Python 3.12 and the Rust version in
Development uses Python 3.15 and the Rust version in
[rust-toolchain.toml](../rust-toolchain.toml), which rustup installs automatically.

```sh
Expand All @@ -13,7 +13,7 @@ make init

### Dev container

`.devcontainer/` defines a toolchain image (Python 3.12 and rustup) that runs
`.devcontainer/` defines a toolchain image (Python 3.15 and rustup) that runs
`make init` on create. It works with VS Code Dev Containers, GitHub Codespaces
(badge in the README), and other dev-container tools, over Docker, Podman, or
the Windows `wslc` runtime (set the extension's "Docker Path" to `wslc`).
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Set up Python (for pre-commit + replacement script)
uses: actions/setup-python@v7
with:
python-version: '3.12'
python-version: '3.15'
cache: pip
cache-dependency-path: |
**/pyproject.toml
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

- uses: actions/setup-python@v7
with:
python-version: "3.12"
python-version: "3.15"

- run: pip install pre-commit --quiet

Expand All @@ -40,7 +40,7 @@ jobs:

- uses: actions/setup-python@v7
with:
python-version: "3.12"
python-version: "3.15"
cache: pip
cache-dependency-path: "**/pyproject.toml"

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

- uses: actions/setup-python@v7
with:
python-version: "3.12"
python-version: "3.15"
cache: pip
cache-dependency-path: "**/pyproject.toml"

Expand All @@ -50,7 +50,7 @@ jobs:
- name: Test and build docs
run: sphinx-build -d docs/_build/doctrees -b html -W --keep-going docs docs/_build/html

- uses: actions/upload-pages-artifact@v3
- uses: actions/upload-pages-artifact@v5
if: github.event_name != 'pull_request'
with:
path: docs/_build/html
Expand All @@ -70,4 +70,4 @@ jobs:
url: ${{ steps.deployment.outputs.page_url }}
steps:
- id: deployment
uses: actions/deploy-pages@v4
uses: actions/deploy-pages@v5
2 changes: 1 addition & 1 deletion .github/workflows/publish-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
steps:
- uses: actions/checkout@v7

- uses: docker/login-action@v3
- uses: docker/login-action@v4
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ jobs:
- windows-latest
- macos-14
env:
# abi3 (py_limited_api = cp310): one wheel per platform covers 3.10+
CIBW_BUILD: "cp310-*"
# abi3 (py_limited_api = cp311): one wheel per platform covers 3.11+
CIBW_BUILD: "cp311-*"
CIBW_SKIP: "pp* *-win32 *-musllinux* *_i686"
# The first cargo call installs the version in rust-toolchain.toml.
CIBW_BEFORE_ALL_LINUX: "curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain none"
Expand All @@ -56,7 +56,7 @@ jobs:
with:
workspaces: crates
- name: Build wheels
uses: pypa/cibuildwheel@v3.4.0
uses: pypa/cibuildwheel@v4.3.5
- uses: actions/upload-artifact@v7
with:
name: cibw-wheels-${{ matrix.os }}
Expand All @@ -70,7 +70,7 @@ jobs:
- uses: actions/checkout@v7
- uses: actions/setup-python@v7
with:
python-version: "3.12"
python-version: "3.15"
- name: Build sdist
run: pipx run build --sdist
# The sdist leaves out rust-toolchain.toml, so this builds with the
Expand All @@ -96,7 +96,7 @@ jobs:
- uses: actions/checkout@v7
- uses: actions/setup-python@v7
with:
python-version: "3.12"
python-version: "3.15"
- run: rustup toolchain install # version from rust-toolchain.toml
- uses: Swatinem/rust-cache@v2
with:
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
path: dist
merge-multiple: true
- name: Create draft release
uses: softprops/action-gh-release@v2
uses: softprops/action-gh-release@v3
with:
draft: true
files: dist/*
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ default_install_hook_types: [pre-commit, commit-msg]

repos:
- repo: https://github.com/compilerla/conventional-pre-commit
rev: v4.4.0
rev: v4.5.0
hooks:
- id: conventional-pre-commit
stages: [commit-msg]
Expand All @@ -20,7 +20,7 @@ repos:
stages: [commit-msg]

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.16.7
rev: v0.17.4
hooks:
- id: ruff-check
args: [--fix]
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PYTHON_VERSION = python3.12
PYTHON_VERSION = python3.15
VENV = .venv

UV := $(shell command -v uv 2>/dev/null)
Expand Down
32 changes: 16 additions & 16 deletions crates/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 crates/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "{{project_name}}_accelerate"
edition = "2024"
rust-version = "1.97"
rust-version = "1.99"
license = "MIT"
publish = false

Expand All @@ -14,7 +14,7 @@ path = "src/lib.rs"
doctest = false

[dependencies]
pyo3 = { version = "0.29", features = ["abi3-py310"] }
pyo3 = { version = "0.30", features = ["abi3-py311"] }

[features]
extension-module = ["pyo3/extension-module"]
Expand Down
9 changes: 5 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ version = "0.1.0"
authors = [{ name = "{{author_name}}" }]
license = "MIT"
readme = "README.md"
requires-python = ">=3.10"
requires-python = ">=3.11"
classifiers = [
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Programming Language :: Python :: 3.15",
"Programming Language :: Rust",
]
dependencies = [
Expand All @@ -28,7 +29,7 @@ dependencies = [
include-package-data = false

[tool.distutils.bdist_wheel]
py_limited_api = "cp310"
py_limited_api = "cp311"

[tool.setuptools.packages.find]
where = ["src"]
Expand Down Expand Up @@ -66,7 +67,7 @@ addopts = "--import-mode=importlib"
filterwarnings = ["error"]

[tool.ruff]
target-version = "py310"
target-version = "py311"

[tool.ruff.lint]
select = ["D", "ANN", "F", "I"]
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
# Keep in sync with crates/Cargo.toml's `rust-version`.
channel = "1.97"
channel = "1.99"
components = ["rustfmt", "clippy"]
profile = "minimal"
6 changes: 3 additions & 3 deletions template-ARTIFACT.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ One paragraph: what the artifact contains and which of the paper's claims it sup
| ----- | ----- |
| Algorithm | |
| Program | |
| Compilation | Rust (version in `rust-toolchain.toml`, installed by `rustup`) via setuptools-rust; Python 3.12 |
| Compilation | Rust (version in `rust-toolchain.toml`, installed by `rustup`) via setuptools-rust; Python 3.15 |
| Data set | |
| Run-time environment | Linux; container image (see below) or any host with Python 3.12 + Rust |
| Run-time environment | Linux; container image (see below) or any host with Python 3.15 + Rust |
| Hardware | x86-64; no accelerator required |
| Metrics | |
| Output | |
Expand All @@ -42,7 +42,7 @@ One paragraph: what the artifact contains and which of the paper's claims it sup

### Software dependencies

Docker (for the container path), or Python 3.12 + `rustup` (for the source path).
Docker (for the container path), or Python 3.15 + `rustup` (for the source path).

## Installation

Expand Down
2 changes: 1 addition & 1 deletion template-README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![CI](https://github.com/{{github_username}}/{{project_name}}/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/{{github_username}}/{{project_name}}/actions/workflows/ci.yml)
[![PyPI - Version](https://img.shields.io/pypi/v/{{project_name}})](https://pypi.org/project/{{project_name}}/)
[![Python](https://img.shields.io/badge/Python-3.10%2B-blue?logo=python&logoColor=white)](https://www.python.org/downloads/)
[![Python](https://img.shields.io/badge/Python-3.11%2B-blue?logo=python&logoColor=white)](https://www.python.org/downloads/)
[![Docs](https://github.com/{{github_username}}/{{project_name}}/actions/workflows/docs.yml/badge.svg?branch=main)](https://{{github_username}}.github.io/{{project_name}}/)
[![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/{{github_username}}/{{project_name}}/blob/main/src/notebooks/01_main.ipynb)
[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/{{github_username}}/{{project_name}})
Expand Down
Loading