Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for PYO3_PYTHON variable #71

Merged
merged 1 commit into from
Aug 6, 2020
Merged

Add support for PYO3_PYTHON variable #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# Changelog

## 0.11
## Unreleased

- Removed python 2 support
- Remove python 2 support.
- Add support for pyo3 `0.12`'s `PYO3_PYTHON` setting.

## 0.10.6 (2018-11-07)

- Fix tomlgen\_rust generating invalid `Cargo.toml` files.
- Fix tomlgen\_rust setting wrong path in `.cargo/config`
- Fix tomlgen\_rust setting wrong path in `.cargo/config`.

## 0.10.5 (2018-09-09)

Expand Down
2 changes: 0 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ export PATH="$HOME/.cargo/bin:$PATH"
cd /io

for PYBIN in /opt/python/cp{35,36,37,38,39}*/bin; do
export PYTHON_SYS_EXECUTABLE="$PYBIN/python"

"${PYBIN}/pip" install -U setuptools wheel setuptools-rust
"${PYBIN}/python" setup.py bdist_wheel
done
Expand Down
4 changes: 0 additions & 4 deletions build-wheels.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/rust/lib"

# Compile wheels
for PYBIN in /opt/python/cp{35,36,37,38,39}*/bin; do
export PYTHON_SYS_EXECUTABLE="$PYBIN/python"
export PYTHON_LIB=$(${PYBIN}/python -c "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))")
export LIBRARY_PATH="$LIBRARY_PATH:$PYTHON_LIB"
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PYTHON_LIB"
rm -f /io/build/lib.*
"${PYBIN}/pip" install -U setuptools setuptools-rust wheel
"${PYBIN}/pip" wheel /io/ -w /io/dist/
Expand Down
2 changes: 0 additions & 2 deletions html-py-ever/build-wheels.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ export PATH="$HOME/.cargo/bin:$PATH"
cd /io

for PYBIN in /opt/python/cp{35,36,37,38,39}*/bin; do
export PYTHON_SYS_EXECUTABLE="$PYBIN/python"

"${PYBIN}/pip" install -U setuptools wheel setuptools-rust
"${PYBIN}/python" setup.py bdist_wheel
done
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ distutils.commands =
test_rust=setuptools_rust:test_rust
tomlgen_rust=setuptools_rust:tomlgen_rust
distutils.setup_keywords =
rust_extensions=setuptools_rust.setuptools_ext:rust_extensions
rust_extensions=setuptools_rust.setuptools_ext:rust_extensions
4 changes: 3 additions & 1 deletion setuptools_rust/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ def build_extension(self, ext):
# disables rust's pkg-config seeking for specified packages,
# which causes pythonXX-sys to fall back to detecting the
# interpreter from the path.
"PATH": os.path.join(bindir, os.environ.get("PATH", ""))
"PATH": os.path.join(bindir, os.environ.get("PATH", "")),
"PYTHON_SYS_EXECUTABLE": sys.executable,
"PYO3_PYTHON": sys.executable,
}
)

Expand Down