Skip to content

Commit

Permalink
Bring tests.yml up to date
Browse files Browse the repository at this point in the history
  • Loading branch information
ddelange committed Sep 23, 2024
1 parent 7998f7d commit b9ede04
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 17 deletions.
20 changes: 8 additions & 12 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@ jobs:
strategy:
matrix:
# This list needs to be kept in sync with:
# - tag.yml
# - maturin_build_wheel.py
# - dists.yml
# - the c_impl tests below
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
rust-toolchain: [stable, beta, nightly]
platform: [
# This list should be kept in sync with tag.yml.
{ os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu", name: "Linux x64" },
# macOS-latest is currently broken by https://github.com/actions/setup-python/issues/855
{ os: "macOS-13", python-architecture: "x64", rust-target: "x86_64-apple-darwin", name: "macOS x64" },
Expand Down Expand Up @@ -64,12 +62,11 @@ jobs:
strategy:
matrix:
# This list needs to be kept in sync with:
# - tag.yml
# - maturin_build_wheel.py
# - dists.yml
# - the rust_impl tests above
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
platform: [
# This list should be kept in sync with tag.yml.
# This list should be kept in sync with dists.yml.
{ os: "ubuntu-latest", python-architecture: "x64", name: "Linux x64" },
# macOS-latest is currently broken by https://github.com/actions/setup-python/issues/855
{ os: "macOS-13", python-architecture: "x64", name: "macOS x64" },
Expand Down Expand Up @@ -113,11 +110,10 @@ jobs:
name: "mypy"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.12"
python-version: "3.x"
# We use numpy to test the error case of trying to hash a strided buffer.
- name: Install pytest, numpy, and mypy
run: pip install pytest numpy mypy
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
[build-system]
# Keep the Maturin version in sync with tag.yml.
requires = ["maturin>=0.14,<0.15"]
requires = ["maturin~=1.7"]
build-backend = "maturin"
5 changes: 2 additions & 3 deletions release.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@ is pushed. To do a release:
3. Push `master` and make sure GitHub CI is green.
4. Tag the release commit and push the tag.

The rest is automatic. For more details, see `tag.yml` and the scripts that it
calls.
The rest is automatic. For more details, see `dists.yml`.

### When a new Python version comes out

When a new Python version comes out, it needs to be added to our CI configs in
several places. See commit [`e54c5a9`](https://github.com/oconnor663/blake3-py/commit/e54c5a94eecca6b9decf7c11588ab9971402276c)
(which added support for Python 3.10) as an example. The comments in
`maturin_build_wheel.py`, `push.yml`, and `tag.yml` should all refer to each
`maturin_build_wheel.py`, `tests.yml`, and `dists.yml` should all refer to each
other, to help us avoid forgetting a spot.

To retroactively add new wheels to an existing release, tag the config change
Expand Down

0 comments on commit b9ede04

Please sign in to comment.