Merge pull request #132 from PyO3/release-0.10

Update PyO3 to 0.11

Author: kngwyu

.github/workflows/test.yml

@@ -18,13 +18,13 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: stable
           default: true
       - run: rustup set default-host ${{ matrix.platform.rust-target }}
       - name: Build without default features

.travis.yml

@@ -1,5 +1,6 @@
 language: python
-dist: xenial
+os: linux
+dist: bionic
 
 cache:
   pip: true
@@ -8,38 +9,26 @@ cache:
 matrix:
   include:
     - python: "3.5"
-      env: FEATURES=python3
     - python: "3.6"
-      env: FEATURES=python3
     - python: "3.7"
-      env: FEATURES=python3
     - python: "3.8"
-      env: FEATURES=python3
+      env: RUN_LINT=1
 
 env:
   global:
-    - TRAVIS_RUST_VERSION=nightly
+    - TRAVIS_RUST_VERSION=stable
     - RUST_BACKTRACE=1
-    - FEATURES=python3
 
 addons:
   apt:
     packages:
-      - libcurl4-openssl-dev
-      - libelf-dev
-      - libdw-dev
-      - cmake
-      - gcc
-      - binutils-dev
-      - libiberty-dev
       - gfortran
 
 before_install:
   - source ./ci/travis/setup.sh
 
 install:
-  - pip install setuptools-rust pytest pytest-benchmark \
-             tox numpy flake8
+  - pip install setuptools-rust pytest tox numpy flake8
 
 script:
   - flake8 examples/

Cargo.toml

@@ -15,7 +15,7 @@ libc = "0.2"
 num-complex = "0.2"
 num-traits = "0.2"
 ndarray = ">=0.13"
-pyo3 = "0.10.1"
+pyo3 = "0.11.1"
 
 [features]
 # In default setting, python version is automatically detected

README.md

@@ -3,6 +3,7 @@ rust-numpy
 [![Build Status](https://travis-ci.org/pyo3/rust-numpy.svg?branch=master)](https://travis-ci.org/pyo3/rust-numpy)
 [![Build status](https://ci.appveyor.com/api/projects/status/bjaru43c7t1alx2x/branch/master?svg=true)](https://ci.appveyor.com/project/kngwyu/rust-numpy/branch/master)
 [![Crate](http://meritbadge.herokuapp.com/numpy)](https://crates.io/crates/numpy)
+[![minimum rustc 1.39](https://img.shields.io/badge/rustc-1.39+-blue.svg)](https://rust-lang.github.io/rfcs/2495-min-rust-version.html)
 
 Rust bindings for the NumPy C-API
 
@@ -12,9 +13,8 @@ Rust bindings for the NumPy C-API
 
 
 ## Requirements
-- current nightly rust (see https://github.com/PyO3/pyo3/issues/5 for nightly features, and
-https://github.com/PyO3/pyo3/blob/master/build.rs for minimum required version)
-- some rust libraries
+- Rust 1.39+
+- Some Rust libraries
   - [ndarray](https://github.com/bluss/ndarray) for rust-side matrix library
   - [pyo3](https://github.com/PyO3/pyo3) for cpython binding
   - and more (see [Cargo.toml](Cargo.toml))
@@ -57,7 +57,7 @@ using [setuptools-rust](https://github.com/PyO3/setuptools-rust).
 name = "numpy-test"
 
 [dependencies]
-pyo3 = "0.10.1"
+pyo3 = "0.11.1"
 numpy = "0.9.0"
 ```
 

ci/travis/setup.sh

@@ -2,37 +2,15 @@
 
 set -e
 
-# Find the installed version of a binary, if any
-_installed() {
-    VERSION=$($@ --version 2>/dev/null || echo "$@ none")
-    echo $VERSION | rev | cut -d' ' -f1 | rev
-}
-
-# Find the latest available version of a binary on `crates.io`
-_latest() {
-    VERSION=$(cargo search -q "$@" | grep "$@" | cut -f2 -d"\"")
-    echo $VERSION
-}
-
 ### Setup Rust toolchain #######################################################
-curl -SsL "https://sh.rustup.rs/" | sh -s -- -y --default-toolchain=$TRAVIS_RUST_VERSION
+curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=$TRAVIS_RUST_VERSION --profile=minimal -y
 export PATH=$PATH:$HOME/.cargo/bin
+if [[ $RUN_LINT == 1 ]]; then
+    rustup component add clippy
+    rustup component add rustfmt
+fi
 
 ### Setup python linker flags ##################################################
-
-python -c """
-import sysconfig
-cfg = sorted(sysconfig.get_config_vars().items())
-print('\n'.join(['{}={}'.format(*x) for x in cfg]))
-"""
-
-export PYTHON_LIB=$(python -c "import sysconfig as s; print(s.get_config_var('LIBDIR'))")
-
-# find $PYTHON_LIB
-export LIBRARY_PATH="$LIBRARY_PATH:$PYTHON_LIB"
-
-# delete any possible empty components
-# https://github.com/google/pulldown-cmark/issues/122#issuecomment-364948741
-LIBRARY_PATH=$(echo $LIBRARY_PATH | sed -E -e 's/^:*//' -e 's/:*$//' -e 's/:+/:/g')
-
+PYTHON_LIB=$(python -c "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))")
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PYTHON_LIB:$HOME/rust/lib"
+echo ${LD_LIBRARY_PATH}

ci/travis/test.sh

@@ -2,8 +2,14 @@
 
 set -ex
 
-cargo build --verbose --features $FEATURES
-cargo test --verbose --features $FEATURES -- --test-threads=1
+cargo build --verbose
+cargo test --verbose
+
+if [[ $RUN_LINT == 1 ]]; then
+    cargo fmt --all -- --check
+    cargo clippy --tests
+    for example in examples/*; do (cd $$example/; cargo clippy) || exit 1; done
+fi
 
 for example in examples/*; do
     if [ $example != 'examples/linalg' ]; then

examples/linalg/Cargo.toml

@@ -14,5 +14,5 @@ ndarray = ">= 0.13"
 ndarray-linalg = { version = "0.12", features = ["openblas"] }
 
 [dependencies.pyo3]
-version = "0.10.1"
+version = "0.11.1"
 features = ["extension-module"]

examples/simple-extension/Cargo.toml

@@ -13,5 +13,5 @@ numpy = { path = "../.." }
 ndarray = ">= 0.12"
 
 [dependencies.pyo3]
-version = "0.10.1"
+version = "0.11.1"
 features = ["extension-module"]