From a224786779a9c28afd3d5d359e987dfa6ab1a8f0 Mon Sep 17 00:00:00 2001 From: Paul Masurel Date: Tue, 23 Feb 2021 10:02:16 +0900 Subject: [PATCH] Messense stable (#29) * Upgrade pyo3 to 0.13 and build on stable Rust * Set python 3.8 for rust lint too Co-authored-by: messense --- .travis.yml | 10 +++++++--- Cargo.toml | 4 ++-- README.md | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index f7ed886..7e43e16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ before_cache: env: global: - - TRAVIS_RUST_VERSION=nightly + - TRAVIS_RUST_VERSION=stable - RUST_BACKTRACE=1 - secure: ZR/4EeOZBCa63aYIuSo36c2DsJoRpOUTQo3zcPzOJoxFxvCTYUJnyX8P38hktdcTcpgEm1ALDbsQDZNboJIP80OkLtWbaQNHgP6jFLqbENryyXYmPunbU9QQWOZaFhEJ+kgUun3kBLYoTW0iZFcJ0AHzjogOEenxKan4lFsZG9Wgku8Q0HX0zK8PPk6ZpMASUrmDAUbW/K6fVuxpix+VF6iPeK1IOxnDSn9CMBI6F1Tq46J/kWzMOWthVthjA0G0OiXi4eQN3ysP/o4bYpr1mifiHCssVKpfwmpqoDR3Nka9H39RN8xcn4X+0h5XA+jAVsD4qUfOcg2otkuZST/h0r1Q30/NrxWmxS6PtIImVlOAxotEkrRwt/DT0sXSRbApmyLApPDPKJ16mjm1miAZvXeJOwB1pT9SKqyxlh4+pPOnXUMYVH44XVCTF7C3zsgxMmv3frRbKfcedJAon4UIIZdE3guA83aadTk6HEXXefmAsxEyJDsA3NJJ8Wm5GkGvrFJZnI9X88eYLX0+H+NW/RHi0CCi6JfnsFjmDpXLRkdAxN8fRIaaDBmleir2AFFXYHAPdcM7z/B1HnTTJBbjeezFwb8JvFPZzxIOijxVfIVeoGcOwgpFzm2wHEi0AH4z2KtAzDQnhdhmle3Q4TrCt78e0iFJb1dANbdmhYpe/xI= @@ -40,7 +40,7 @@ jobs: before_install: - pip install --upgrade pip - pip install -U pytest - - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly + - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable - source "$HOME"/.cargo/env before_script: - cp target/debug/libtantivy.so tantivy/tantivy.so @@ -71,9 +71,13 @@ jobs: - cp target/debug/tantivy.dll tantivy/tantivy.pyd env: PATH=/c/Python38:/c/Python37:/c/Python38/Scripts:/c/Python37/Scripts:$PATH - - name: 'rust linters' + - os: linux + dist: bionic + python: 3.8 + name: 'rust linters' install: rustup component add clippy rustfmt script: + - python3 --version - cargo clippy - cargo fmt -- --check stage: lint diff --git a/Cargo.toml b/Cargo.toml index dbc7605..8d04759 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,9 +17,9 @@ itertools = "0.9.0" futures = "0.3.5" [dependencies.pyo3] -version = "0.12.1" +version = "0.13.2" features = ["extension-module"] [package.metadata.maturin] requires-python = ">=3.7" -project-url = ["https://github.com/tantivy-search/tantivy-py"] +project-url = { Source = "https://github.com/tantivy-search/tantivy-py" } diff --git a/README.md b/README.md index 73743ca..0d61bb5 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ build from source, this means that Rust needs to be installed before building can succeed. Note that the bindings are using [PyO3](https://github.com/PyO3/pyo3), which -requires rust nightly and only supports python3. +only supports python3. # Development