Skip to content

Commit

Permalink
debug
Browse files Browse the repository at this point in the history
  • Loading branch information
messense committed Oct 30, 2022
1 parent 61bd9de commit ea6e3e7
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 6 deletions.
14 changes: 12 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: ${{ !contains(github.event.pull_request.labels.*.name, 'CI-no-fail-fast') }}
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
os: [ windows-latest ]
runs-on: ${{ matrix.os }}
env:
RUST_BACKTRACE: '1'
Expand All @@ -39,6 +39,11 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: "3.10"
- run: |
ls C:\hostedtoolcache\windows\Python\3.10.8\x64
ls C:\hostedtoolcache\windows\Python\3.10.8\x64\libs
python3 --version
if: matrix.os == 'windows-latest'
- name: Install cffi and virtualenv
run: pip install cffi virtualenv ziglang~=0.9.0 twine
- uses: actions-rs/toolchain@v1
Expand Down Expand Up @@ -86,7 +91,12 @@ jobs:
key: test-crates-${{ runner.os }}-${{ steps.rustup.outputs.rustc_hash }}-${{ hashFiles('test-crates/*/Cargo.lock') }}

- name: cargo test
run: cargo nextest run --features password-storage
run: cargo nextest run --features password-storage develop_pyo3_mixed
- run: |
test-crates\venvs\develop-pyo3-mixed-py-subdir-cpython\Scripts\python.exe --version
test-crates\venvs\develop-pyo3-mixed-py-subdir-cpython\Scripts\python.exe -c 'import sys; print(sys.base_prefix)'
test-crates\venvs\develop-pyo3-mixed-py-subdir-cpython\Scripts\python.exe -m sysconfig
if: always()
- uses: actions/setup-python@v4
with:
python-version: "pypy-3.7"
Expand Down
1 change: 1 addition & 0 deletions src/compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@ fn compile_target(
if let Some(interpreter) = python_interpreter {
// Target python interpreter isn't runnable when cross compiling
if interpreter.runnable {
println!("Python exe: {}", interpreter.executable.display());
if bindings_crate.is_bindings("pyo3")
|| bindings_crate.is_bindings("pyo3-ffi")
|| (matches!(bindings_crate, BridgeModel::BindingsAbi3(_, _))
Expand Down
7 changes: 3 additions & 4 deletions test-crates/pyo3-mixed-py-subdir/Cargo.lock

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

3 changes: 3 additions & 0 deletions test-crates/pyo3-mixed-py-subdir/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@ crate-type = ["cdylib"]
[package.metadata.maturin]
python-source = "python"
name = "pyo3_mixed_py_subdir._pyo3_mixed"

[patch.crates-io]
pyo3-build-config = { git = "https://github.com/messense/pyo3.git", branch = "debug" }

0 comments on commit ea6e3e7

Please sign in to comment.