Skip to content

Commit c571b34

Browse files
authored
Merge pull request #66 from davidhewitt/update-example
Update html-py-ever to pyo3 0.11.1
2 parents 1143faf + 773a7c0 commit c571b34

File tree

10 files changed

+337
-439
lines changed

10 files changed

+337
-439
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ matrix:
1313
- python: "3.8-dev"
1414

1515
install:
16-
- curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2019-06-22
16+
- curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable
1717
- source $HOME/.cargo/env
1818
- export PYTHON_LIB=$(python -c "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))")
1919
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PYTHON_LIB:$HOME/rust/lib"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ requires = ["setuptools", "wheel", "setuptools-rust"]
5656
#!/bin/bash
5757
set -ex
5858

59-
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly -y
59+
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y
6060
export PATH="$HOME/.cargo/bin:$PATH"
6161

6262
cd /io

build-wheels.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e -x
33

44
mkdir ~/rust-installer
55
curl -sL https://static.rust-lang.org/rustup.sh -o ~/rust-installer/rustup.sh
6-
sh ~/rust-installer/rustup.sh --prefix=~/rust --spec=nightly -y --disable-sudo
6+
sh ~/rust-installer/rustup.sh --prefix=~/rust --spec=stable -y --disable-sudo
77
export PATH="$HOME/rust/bin:$PATH"
88
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/rust/lib"
99

example_tomlgen/hello/english/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
extern crate pyo3;
33

44
use pyo3::prelude::*;
5+
use pyo3::wrap_pyfunction;
56

67
#[pyfunction]
78
fn hello(_py: Python) -> PyResult<()> {

example_tomlgen/hello/french/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
extern crate pyo3;
33

44
use pyo3::prelude::*;
5+
use pyo3::wrap_pyfunction;
56

67
#[pyfunction]
78
fn hello(_py: Python) -> PyResult<()> {

example_tomlgen/setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ zip_safe = false
1010
create_workspace = true
1111

1212
[tomlgen_rust.dependencies]
13-
pyo3 = { version = "0.6.0-alpha", features = ["extension-module"] }
13+
pyo3 = { version = "0.11.1", features = ["extension-module"] }
1414

1515
[tomlgen_rust.dependencies.hello-english]
1616
english-lint = "*"

0 commit comments

Comments
 (0)