Skip to content

Commit

Permalink
Support Python 3.12 and bump rustworkx to 0.13.2 (#990)
Browse files Browse the repository at this point in the history
* Bump rustworkx to 0.13.2

* Bump rustworkx to 0.13.2

* Add release note for 0.13.2

* Bump cibuildwheel version

In order to build Python 3.12 wheels on release we need to use a newer
version of cibuildwheel. This commit bumps cibuildwheel to the latest
release 2.16.1 which includes building Python 3.12 wheels by default
using 3.12.0rc3.

---------

Co-authored-by: Matthew Treinish <mtreinish@kortar.org>
  • Loading branch information
IvanIsCoding and mtreinish committed Oct 3, 2023
1 parent a0bca3a commit b616f5e
Show file tree
Hide file tree
Showing 10 changed files with 37 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
strategy:
matrix:
rust: [stable]
python-version: ['3.7.16', 3.8, 3.9, "3.10", "3.11"]
python-version: ['3.7.16', 3.8, 3.9, "3.10", "3.11", "3.12.0-rc.3"]
platform: [
{ os: "macOS-latest", python-architecture: "x64", rust-target: "x86_64-apple-darwin" },
{ os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" },
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- uses: dtolnay/rust-toolchain@stable
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==2.10.1 twine
python -m pip install cibuildwheel==2.16.1 twine
- name: Build wheels
run: |
python -m cibuildwheel --output-dir wheelhouse
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
platforms: all
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==2.10.1 twine
python -m pip install cibuildwheel==2.16.1 twine
- name: Build wheels
run: |
python -m cibuildwheel --output-dir wheelhouse
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
platforms: all
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==2.10.1 twine
python -m pip install cibuildwheel==2.16.1 twine
- name: Build wheels
run: |
python -m cibuildwheel --output-dir wheelhouse
Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:
platforms: all
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==2.10.1 twine
python -m pip install cibuildwheel==2.16.1 twine
- name: Build wheels
run: |
python -m cibuildwheel --output-dir wheelhouse
Expand Down Expand Up @@ -226,7 +226,7 @@ jobs:
platforms: all
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==2.10.1 twine
python -m pip install cibuildwheel==2.16.1 twine
- name: Build wheels
run: |
python -m cibuildwheel --output-dir wheelhouse
Expand Down Expand Up @@ -270,7 +270,7 @@ jobs:
platforms: all
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==2.10.1 twine
python -m pip install cibuildwheel==2.16.1 twine
- name: Build wheels
run: |
python -m cibuildwheel --output-dir wheelhouse
Expand Down Expand Up @@ -300,7 +300,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Build wheels
uses: joerick/cibuildwheel@v2.10.1
uses: joerick/cibuildwheel@v2.16.1
env:
CIBW_BEFORE_ALL: rustup target add aarch64-apple-darwin
CIBW_ARCHS_MACOS: arm64 universal2
Expand Down Expand Up @@ -338,7 +338,7 @@ jobs:
run: rustup default stable-i686-pc-windows-msvc
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==2.10.1 twine
python -m pip install cibuildwheel==2.16.1 twine
- name: Build wheels
run: |
python -m cibuildwheel --output-dir wheelhouse
Expand Down
32 changes: 16 additions & 16 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
@@ -1,7 +1,7 @@
[package]
name = "rustworkx"
description = "A python graph library implemented in Rust"
version = "0.13.1"
version = "0.13.2"
authors = ["Matthew Treinish <mtreinish@kortar.org>"]
license = "Apache-2.0"
readme = "README.md"
Expand Down Expand Up @@ -33,7 +33,7 @@ ndarray-stats = "0.5.1"
quick-xml = "0.28"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
rustworkx-core = { path = "rustworkx-core", version = "=0.13.1" }
rustworkx-core = { path = "rustworkx-core", version = "=0.13.2" }

[dependencies.pyo3]
version = "0.19.1"
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
docs_url_prefix = "ecosystem/rustworkx"

# The short X.Y version.
version = '0.13.1'
version = '0.13.2'
# The full version, including alpha/beta/rc tags.
release = '0.13.1'
release = '0.13.2'

extensions = ['sphinx.ext.autodoc',
'sphinx.ext.autosummary',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
prelude: >
rustworkx 0.13.2 is a minor release, adding support for Python 3.12.
Existing users of 0.13.1 should not be affected by this release, but
are still encouraged to upgraded.
2 changes: 1 addition & 1 deletion rustworkx-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rustworkx-core"
version = "0.13.1"
version = "0.13.2"
edition = "2021"
authors = ["Matthew Treinish <mtreinish@kortar.org>"]
description = "Rust APIs used for rustworkx algorithms"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def readme():
graphviz_extras = ['pillow>=5.4']

PKG_NAME = os.getenv('RUSTWORKX_PKG_NAME', "rustworkx")
PKG_VERSION = "0.13.1"
PKG_VERSION = "0.13.2"
PKG_PACKAGES = ["rustworkx", "rustworkx.visualization"]
PKG_INSTALL_REQUIRES = ['numpy>=1.16.0']
RUST_EXTENSIONS = [RustExtension("rustworkx.rustworkx", "Cargo.toml",
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
minversion = 4.4.0
envlist = py37, py38, py39, py310, py311, lint
envlist = py37, py38, py39, py310, py311, py312, lint
isolated_build = true

[testenv]
Expand Down

0 comments on commit b616f5e

Please sign in to comment.