Skip to content

Commit 4fbdebd

Browse files
authored
Merge pull request #273 from PyO3/re-export-pyo3
Re-export PyO3 to make it easier for dependent crates to end up with matching PyO3 versions.
2 parents 6275f48 + 212d959 commit 4fbdebd

File tree

8 files changed

+32
-46
lines changed

8 files changed

+32
-46
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@ jobs:
6868
with open("Cargo.toml", "w") as f:
6969
toml.dump(cargo_toml, f)
7070
shell: python
71-
- name: Build without default features
72-
run: cargo build --no-default-features
73-
- name: Build with default features
74-
run: cargo build
7571
- name: Test
7672
run: |
7773
pip install numpy
@@ -80,13 +76,12 @@ jobs:
8076
if: ${{ !startsWith(matrix.python-version, 'pypy') }}
8177
- name: Test example
8278
run: |
83-
pip install tox
84-
tox -c examples/simple-extension
79+
pip install nox
80+
nox -f examples/simple-extension/noxfile.py
8581
env:
8682
CARGO_TERM_VERBOSE: true
8783
CARGO_BUILD_TARGET: ${{ matrix.platform.rust-target }}
8884
RUST_BACKTRACE: 1
89-
TOX_TESTENV_PASSENV: CARGO_BUILD_TARGET
9085

9186
check-msrv:
9287
runs-on: ubuntu-latest
@@ -135,9 +130,8 @@ jobs:
135130
shell: python
136131
- name: Test example
137132
run: |
138-
pip install tox
139-
tox
140-
working-directory: examples/simple-extension
133+
pip install nox
134+
nox -f examples/simple-extension/noxfile.py
141135
142136
examples:
143137
runs-on: ubuntu-latest
@@ -159,9 +153,9 @@ jobs:
159153
continue-on-error: true
160154
- name: Test examples
161155
run: |
162-
pip install tox
163-
tox -c examples/linalg
164-
tox -c examples/parallel
156+
pip install nox
157+
nox -f examples/linalg/noxfile.py
158+
nox -f examples/parallel/noxfile.py
165159
166160
coverage:
167161
runs-on: ubuntu-latest

examples/linalg/noxfile.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import nox
2+
3+
4+
@nox.session
5+
def tests(session):
6+
session.install('pip', 'numpy', 'pytest')
7+
session.run('pip', 'install', '.', '-v')
8+
session.run('pytest')

examples/linalg/tox.ini

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

examples/parallel/noxfile.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import nox
2+
3+
4+
@nox.session
5+
def tests(session):
6+
session.install('pip', 'numpy', 'pytest')
7+
session.run('pip', 'install', '.', '-v')
8+
session.run('pytest')

examples/parallel/tox.ini

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

examples/simple-extension/noxfile.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import nox
2+
3+
4+
@nox.session
5+
def tests(session):
6+
session.install('pip', 'numpy', 'pytest')
7+
session.run('pip', 'install', '.', '-v')
8+
session.run('pytest')

examples/simple-extension/tox.ini

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

src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ mod slice_container;
4040
mod sum_products;
4141

4242
pub use ndarray;
43+
pub use pyo3;
4344

4445
pub use crate::array::{
4546
get_array_module, PyArray, PyArray0, PyArray1, PyArray2, PyArray3, PyArray4, PyArray5,

0 commit comments

Comments
 (0)