Skip to content

Commit

Permalink
set rust target through env
Browse files Browse the repository at this point in the history
  • Loading branch information
davidhewitt committed Dec 20, 2020
1 parent cfefd8e commit ce52b03
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,25 +85,25 @@ jobs:
run: echo LD_LIBRARY_PATH=${pythonLocation}/lib >> $GITHUB_ENV

- name: Build docs
run: cargo doc --features "num-bigint num-complex" --verbose --target ${{ matrix.platform.rust-target }}
run: cargo doc --features "num-bigint num-complex" --verbose

- name: Build without default features
run: cargo build --no-default-features --verbose --target ${{ matrix.platform.rust-target }}
run: cargo build --no-default-features --verbose

- name: Build with default features
run: cargo build --features "num-bigint num-complex" --verbose --target ${{ matrix.platform.rust-target }}
run: cargo build --features "num-bigint num-complex" --verbose

# Run tests (except on PyPy, because no embedding API).
- if: matrix.python-version != 'pypy-3.6'
name: Test
run: cargo test --features "num-bigint num-complex" --target ${{ matrix.platform.rust-target }}
run: cargo test --features "num-bigint num-complex"
# Run tests again, but in abi3 mode
- if: matrix.python-version != 'pypy-3.6'
name: Test (abi3)
run: cargo test --no-default-features --features "abi3,macros" --target ${{ matrix.platform.rust-target }}
run: cargo test --no-default-features --features "abi3,macros"

- name: Test proc-macro code
run: cargo test --manifest-path=pyo3-macros-backend/Cargo.toml --target ${{ matrix.platform.rust-target }}
run: cargo test --manifest-path=pyo3-macros-backend/Cargo.toml

- name: Install python test dependencies
run: |
Expand All @@ -118,6 +118,7 @@ jobs:
done
env:
CARGO_BUILD_TARGET: ${{ matrix.platform.rust-target }}
RUST_BACKTRACE: 1

coverage:
Expand Down
2 changes: 1 addition & 1 deletion examples/maturin_extension/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[build-system]
requires = ["maturin @ git+https://github.com/davidhewitt/maturin.git@f4dce9879999ea404379e2ebcceb9af661bcd5ec"]
requires = ["maturin @ git+https://github.com/PyO3/maturin.git@9f8cdba7894cc65110d1ba94140adef97b91e1e3"]
build-backend = "maturin"
2 changes: 1 addition & 1 deletion examples/maturin_extension/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ description = Run the unit tests under {basepython}
deps = -rrequirements-dev.txt
commands =
# Use pip fork with in-tree-build feature (soon to be merged to master)
python -m pip install --upgrade git+https://github.com/davidhewitt/pip.git@fede74f7439f6c940f19a2357738b500372abe3d
python -m pip install --upgrade git+https://github.com/davidhewitt/pip.git@dc72aba2f7ea00ef513e46c892d4b2f16d1c2277
python -m pip install . --use-feature=in-tree-build
pytest {posargs}

0 comments on commit ce52b03

Please sign in to comment.