Skip to content

Commit

Permalink
Merge branch 'Qiskit:main' into degree_centrality_implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
Gohlub authored Nov 17, 2024
2 parents 608ee9c + 44d9fb0 commit dd4f443
Show file tree
Hide file tree
Showing 17 changed files with 653 additions and 78 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
strategy:
matrix:
rust: [stable]
python-version: [3.9, "3.10", "3.11", "3.12"]
python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
platform: [
{ os: "macOS-13", python-architecture: "x64", rust-target: "x86_64-apple-darwin" },
{ os: "macOS-14", python-architecture: "arm64", rust-target: "aarch64-apple-darwin" },
Expand All @@ -73,7 +73,7 @@ jobs:
msrv: "MSRV"
# Test future versions of Rust and Python
- rust: beta
python-version: "3.13-dev"
python-version: "3.13" # upgrade to 3.14-dev when the release candidate is available
platform: { os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" }
msrv: "Beta"
# Exclude python 3.9 on arm64 until actions/setup-python#808 is resolved
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.9, "3.10", "3.11", "3.12"]
python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- uses: dtolnay/rust-toolchain@stable
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==2.17.0
python -m pip install cibuildwheel==2.21.3
- name: Build wheels
run: |
python -m cibuildwheel --output-dir wheelhouse
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
platforms: all
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==2.17.0
python -m pip install cibuildwheel==2.21.3
- name: Build wheels
run: |
python -m cibuildwheel --output-dir wheelhouse
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
platforms: all
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==2.17.0
python -m pip install cibuildwheel==2.21.3
- name: Build wheels
run: |
python -m cibuildwheel --output-dir wheelhouse
Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
platforms: all
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==2.17.0
python -m pip install cibuildwheel==2.21.3
- name: Build wheels
run: |
python -m cibuildwheel --output-dir wheelhouse
Expand Down Expand Up @@ -220,7 +220,7 @@ jobs:
platforms: all
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==2.17.0
python -m pip install cibuildwheel==2.21.3
- name: Build wheels
run: |
python -m cibuildwheel --output-dir wheelhouse
Expand Down Expand Up @@ -253,7 +253,7 @@ jobs:
run: rustup default stable-i686-pc-windows-msvc
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==2.17.0
python -m pip install cibuildwheel==2.21.3
- name: Build wheels
run: |
python -m cibuildwheel --output-dir wheelhouse
Expand Down
84 changes: 23 additions & 61 deletions Cargo.lock

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

5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ num-complex = "0.4"
num-traits.workspace = true
numpy.workspace = true
petgraph.workspace = true
quick-xml = "0.36"
quick-xml = "0.37"
rand.workspace = true
rand_pcg.workspace = true
rayon.workspace = true
Expand All @@ -62,11 +62,12 @@ smallvec = { version = "1.0", features = ["union"] }
rustworkx-core = { path = "rustworkx-core", version = "=0.16.0" }

[dependencies.pyo3]
version = "0.22.5"
version = "0.22.6"
features = ["abi3-py39", "extension-module", "hashbrown", "num-bigint", "num-complex", "indexmap", "py-clone"]

[dependencies.sprs]
version = "^0.11"
default-features = false
features = ["multi_thread"]

[profile.release]
Expand Down
3 changes: 1 addition & 2 deletions constraints.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
decorator==4.4.2
pillow<10.0.0;python_version<'3.13'
pillow>=10.1
lxml==5.1.1
2 changes: 1 addition & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

def install_rustworkx(session):
session.install(*deps)
session.install(".", "-c", "constraints.txt")
session.install(".[all]", "-c", "constraints.txt")

# We define a common base such that -e test triggers a test with the current
# Python version of the interpreter and -e test_with_version launches
Expand Down
8 changes: 8 additions & 0 deletions releasenotes/notes/correct-edge-colors-e082e1761e1c060b.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
fixes:
- |
Fixed a bug introduced in version 0.15 where the edge colors specified as
a list in calls to :func:`~rustworkx.visualization.mpl_draw` were not
having their order respected. Instead, the order of the colors was
being shuffled. This has been restored and now the behavior should
match that of 0.14.
14 changes: 14 additions & 0 deletions releasenotes/notes/karate-club-35708b3838689a0b.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
features:
- |
Added a new function, :func:`~rustworkx.generators.karate_club_graph` that
returns Zachary's Karate Club graph, commonly found in social network examples.
.. jupyter-execute::
import rustworkx.generators
from rustworkx.visualization import mpl_draw
graph = rustworkx.generators.karate_club_graph()
layout = rustworkx.circular_layout(graph)
mpl_draw(graph, pos=layout)
Loading

0 comments on commit dd4f443

Please sign in to comment.