Skip to content

Commit ff76ef8

Browse files
committed
Remove retworkx and Python 3.9 support
1 parent 69af7ff commit ff76ef8

File tree

10 files changed

+19
-201
lines changed

10 files changed

+19
-201
lines changed

.github/workflows/docs_dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Set up Python
1919
uses: actions/setup-python@v5
2020
with:
21-
python-version: '3.10'
21+
python-version: '3.12'
2222
- name: Install dependencies
2323
run: |
2424
pip install -U --group testinfra

.github/workflows/docs_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Python
2020
uses: actions/setup-python@v5
2121
with:
22-
python-version: '3.10'
22+
python-version: '3.12'
2323
- name: Install dependencies
2424
run: |
2525
pip install -U --group testinfra

.github/workflows/main.yml

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/checkout@v4
2626
- uses: actions/setup-python@v5
2727
with:
28-
python-version: "3.10"
28+
python-version: "3.12"
2929
- run: |
3030
pip install -U --group lint
3131
- uses: dtolnay/rust-toolchain@stable
@@ -38,9 +38,9 @@ jobs:
3838
- name: Clippy
3939
run: cargo clippy --workspace --all-targets -- -D warnings
4040
- name: Black Codestyle Format
41-
run: black --check --diff rustworkx tests retworkx
41+
run: black --check --diff rustworkx tests
4242
- name: Python Lint
43-
run: ruff check rustworkx setup.py tests retworkx
43+
run: ruff check rustworkx setup.py tests
4444
- name: Check stray release notes
4545
run: python tools/find_stray_release_notes.py
4646
- name: rustworkx-core Rust Tests
@@ -61,7 +61,7 @@ jobs:
6161
strategy:
6262
matrix:
6363
rust: [stable]
64-
python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
64+
python-version: ["3.10", "3.11", "3.12", "3.13"]
6565
platform: [
6666
{ os: "macOS-13", python-architecture: "x64", rust-target: "x86_64-apple-darwin" },
6767
{ os: "macOS-14", python-architecture: "arm64", rust-target: "aarch64-apple-darwin" },
@@ -70,20 +70,16 @@ jobs:
7070
{ os: "windows-latest", python-architecture: "x64", rust-target: "x86_64-pc-windows-msvc" },
7171
]
7272
include:
73-
# Test ARM + minimal supported Rust version
73+
# Test minimal supported Rust version
7474
- rust: 1.79.0
75-
python-version: "3.10"
75+
python-version: "3.12"
7676
platform: { os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" }
7777
msrv: "MSRV"
78-
# Test ARM + future versions of Rust and Python
78+
# Test future versions of Rust and Python
7979
- rust: beta
80-
python-version: "3.13" # upgrade to 3.14-dev when the release candidate is available
80+
python-version: "3.14-dev" # upgrade to 3.15-dev when the release candidate is available
8181
platform: { os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" }
8282
msrv: "Beta"
83-
# Exclude python 3.9 on arm64 until actions/setup-python#808 is resolved
84-
exclude:
85-
- platform: {os: "macOS-14", python-architecture: "arm64", rust-target: "aarch64-apple-darwin" }
86-
python-version: 3.9
8783
steps:
8884
- uses: actions/checkout@v4
8985
- name: Set up Python ${{ matrix.python-version }}
@@ -112,7 +108,7 @@ jobs:
112108
runs-on: ubuntu-latest
113109
strategy:
114110
matrix:
115-
python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
111+
python-version: ["3.10", "3.11", "3.12", "3.13"]
116112
steps:
117113
- uses: actions/checkout@v4
118114
- name: Set up Python ${{ matrix.python-version }}
@@ -137,7 +133,7 @@ jobs:
137133
- name: Set up Python ${{ matrix.python-version }}
138134
uses: actions/setup-python@v5
139135
with:
140-
python-version: "3.10"
136+
python-version: "3.12"
141137
- name: Install Rust toolchain
142138
uses: dtolnay/rust-toolchain@stable
143139
with:
@@ -185,7 +181,7 @@ jobs:
185181
- name: Set up Python ${{ matrix.python-version }}
186182
uses: actions/setup-python@v5
187183
with:
188-
python-version: "3.10"
184+
python-version: "3.12"
189185
- name: Install Rust toolchain
190186
uses: dtolnay/rust-toolchain@stable
191187
- name: Install binary deps

.github/workflows/wheels.yml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -186,26 +186,3 @@ jobs:
186186
with:
187187
path: ./wheelhouse/*.whl
188188
name: shared-wheel-builds-win32
189-
retworkx-compat-build:
190-
name: Build retworkx
191-
runs-on: ubuntu-latest
192-
environment: release
193-
permissions:
194-
id-token: write
195-
needs: ["upload_shared_wheels"]
196-
steps:
197-
- uses: actions/checkout@v4
198-
- uses: actions/setup-python@v5
199-
name: Install Python
200-
with:
201-
python-version: '3.10'
202-
- name: Install deps
203-
run: pip install -U setuptools-rust wheel build
204-
- name: Build sdist
205-
run: pushd retworkx && python setup.py bdist_wheel && popd
206-
- uses: actions/upload-artifact@v4
207-
with:
208-
path: ./retworkx/dist/*
209-
name: sdist-retworkx
210-
- name: Publish package distributions to PyPI
211-
uses: pypa/gh-action-pypi-publish@release/v1

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ flate2 = "1.0.35"
6767

6868
[dependencies.pyo3]
6969
version = "0.24"
70-
features = ["abi3-py39", "extension-module", "hashbrown", "num-bigint", "num-complex", "indexmap", "py-clone"]
70+
features = ["abi3-py310", "extension-module", "hashbrown", "num-bigint", "num-complex", "indexmap", "py-clone"]
7171

7272
[dependencies.sprs]
7373
version = "^0.11"

noxfile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def lint(session):
3434
black(session)
3535
typos(session)
3636
session.install(*lint_deps)
37-
session.run("ruff", "check", "rustworkx", "retworkx", "setup.py")
37+
session.run("ruff", "check", "rustworkx", "setup.py")
3838
session.run("cargo", "fmt", "--all", "--", "--check", external=True)
3939
session.run("python", "tools/find_stray_release_notes.py")
4040

@@ -74,7 +74,7 @@ def docs_clean(session):
7474
@nox.session(python=["3"])
7575
def black(session):
7676
session.install(*[d for d in lint_deps if "black" in d])
77-
session.run("black", "rustworkx", "tests", "retworkx", *session.posargs)
77+
session.run("black", "rustworkx", "tests", *session.posargs)
7878

7979
@nox.session(python=["3"])
8080
def typos(session):

retworkx/retworkx/__init__.py

Lines changed: 0 additions & 28 deletions
This file was deleted.

retworkx/retworkx/namespace.py

Lines changed: 0 additions & 75 deletions
This file was deleted.

retworkx/setup.py

Lines changed: 0 additions & 52 deletions
This file was deleted.

tox.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ deps =
3737
ruff
3838
allowlist_externals=cargo
3939
commands =
40-
black --check --diff {posargs} '../rustworkx' '../tests' '../retworkx'
41-
ruff check ../rustworkx ../retworkx . ../setup.py
40+
black --check --diff {posargs} '../rustworkx' '../tests'
41+
ruff check ../rustworkx . ../setup.py
4242
cargo fmt --all -- --check
4343
python {toxinidir}/tools/find_stray_release_notes.py
4444
python -c "print('\nrustworkx no longer supports tox. Please run the equivalent command with nox:\n\n\tnox -e lint\n')"
@@ -77,7 +77,7 @@ skip_install = true
7777
deps =
7878
black~=24.8
7979
commands =
80-
black {posargs} '../rustworkx' '../tests' '../retworkx'
80+
black {posargs} '../rustworkx' '../tests'
8181
python -c "print('\nrustworkx no longer supports tox. Please run the equivalent command with nox:\n\tnox -e black\n')"
8282

8383
[testenv:stubs]

0 commit comments

Comments
 (0)