Skip to content

Commit 1582ad9

Browse files
authored
Merge pull request #160 from PyO3/fix-1.39
Add CI for Rust 1.39.0
2 parents 6d05f1c + ca02194 commit 1582ad9

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

.travis.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,21 @@ cache:
66
pip: true
77
cargo: true
88

9-
matrix:
9+
env:
10+
global:
11+
- TRAVIS_RUST_VERSION=stable
12+
- RUST_BACKTRACE=1
13+
14+
jobs:
1015
include:
1116
- python: "3.5"
1217
- python: "3.6"
1318
- python: "3.7"
1419
- python: "3.8"
1520
env: RUN_LINT=1
16-
17-
env:
18-
global:
19-
- TRAVIS_RUST_VERSION=stable
20-
- RUST_BACKTRACE=1
21+
- name: MSRV
22+
python: "3.8"
23+
env: TRAVIS_RUST_VERSTION=1.39.0
2124

2225
addons:
2326
apt:

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ libc = "0.2"
1515
num-complex = "0.2"
1616
num-traits = "0.2"
1717
ndarray = ">=0.13"
18-
pyo3 = "0.12"
18+
pyo3 = ">=0.12"
1919

2020
[features]
2121
# In default setting, python version is automatically detected

src/npyiter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ impl<'py, T: Element, S: MultiIterModeWithManyArrays> NpyMultiIterBuilder<'py, T
436436
was_writables,
437437
..
438438
} = self;
439-
debug_assert!(arrays.len() <= i32::MAX as usize);
439+
debug_assert!(arrays.len() <= std::i32::MAX as usize);
440440
debug_assert!(2 <= arrays.len());
441441

442442
let mut opflags = S::flags();

0 commit comments

Comments
 (0)