diff --git a/native/Cargo.toml b/native/Cargo.toml index d38b863..510fdc1 100755 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -29,9 +29,9 @@ reduce = "0.1.2" serde = { version = "1.0.106", features = ["derive"] } bincode = "1.2.1" better-panic = "0.2.0" -squaremat = { path = "./squaremat", version = "0.6" } +squaremat = { path = "./squaremat" } md5 = "0.7.0" -lbfgsb-sys = { git = "https://github.com/ethanhs/lbfgsb-sys.git", version = "0.1.0", features = ["static"], optional = true } +lbfgsb-sys = { git = "https://github.com/ethanhs/lbfgsb-sys.git", features = ["static"], optional = true } rand = "0.7.3" [dependencies.pyo3] diff --git a/native/Dockerfile b/native/Dockerfile index d965cca..97dd331 100644 --- a/native/Dockerfile +++ b/native/Dockerfile @@ -7,17 +7,18 @@ ENV PATH /opt/python/cp35-cp35m/bin/:/opt/python/cp36-cp36m/bin/:/opt/python/cp3 ENV USER root RUN curl https://sh.rustup.rs -sSf | sh -s -- -y \ - && rustup toolchain add nightly-2020-01-23 \ + && rustup set profile minimal \ + && rustup toolchain add nightly-2020-04-27 \ && python3 -m pip install --no-cache-dir cffi \ && mkdir /io RUN git clone https://github.com/PyO3/maturin /maturin/ -RUN cargo +nightly-2020-01-23 rustc --bin maturin --manifest-path /maturin/Cargo.toml -- -C link-arg=-s \ +RUN cargo +nightly-2020-04-27 rustc --bin maturin --manifest-path /maturin/Cargo.toml -- -C link-arg=-s \ && mv /maturin/target/debug/maturin /usr/bin/maturin \ && rm -rf /maturin -RUN rustup default nightly-2020-01-23 +RUN rustup default nightly-2020-04-27 WORKDIR /io