Use stable Rust in CI

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/

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

src/array.rs

@@ -225,7 +225,7 @@ impl<T, D> PyArray<T, D> {
     /// use numpy::PyArray3;
     /// let gil = pyo3::Python::acquire_gil();
     /// let arr = PyArray3::<f64>::new(gil.python(), [4, 5, 6], false);
-    /// assert_eq!(arr.ndim(),
+    /// assert_eq!(arr.ndim(), 3);
     /// ```
     // C API: https://numpy.org/doc/stable/reference/c-api/array.html#c.PyArray_NDIM
     pub fn ndim(&self) -> usize {

src/lib.rs

@@ -57,15 +57,10 @@ pub use ndarray::{Ix1, Ix2, Ix3, Ix4, Ix5, Ix6, IxDyn};
 #[doc(hidden)]
 pub mod doc_test {
     macro_rules! doc_comment {
-        ($x:expr, $($tt:tt)*) => {
+        ($x: expr, $modname: ident) => {
             #[doc = $x]
-            $($tt)*
+            mod $modname {}
         };
     }
-    macro_rules! doctest {
-        ($x: literal, $y:ident) => {
-            doc_comment!(include_str!($x), mod $y {});
-        };
-    }
-    doctest!("../README.md", readme_md);
+    doc_comment!(include_str!("../README.md"), readme);
 }