use rustup instead of cross everywhere

Author: mckaymatt

.gitignore

@@ -62,4 +62,7 @@ target/
 .python-version
 
 # virtualenv
-.venv/
+.venv/
+
+# Wheelhouse
+wheelhouse/

.travis.yml

@@ -11,6 +11,8 @@ env:
   global:
     # TODO Update this to match the name of your project.
     - CRATE_NAME=trust_pypi_example
+    # Rust release. E.g. Stable, nightly, nightly-2014-12-18
+    - RUSTRELEASE=stable
 
 matrix:
   include:
@@ -20,24 +22,24 @@ matrix:
 
 
     # Linux
-    # we are using Rustup instead of cross when WHEELPLATFORM="*manylinux*". This is because both 
+    # we are using Rustup instead of cross when WHEELPLATFORM="*manylinux*". This is because both
     # manylinux and Cross depend on Docker but the shared libs in the Cross contains are too new
-    # to make valid manylinux containers. 
+    # to make valid manylinux containers.
     #
-    # You can lean more about the differnt Rustup toolchains here: 
+    # You can lean more about the differnt Rustup toolchains here:
     # https://github.com/rust-lang-nursery/rustup.rs#toolchain-specification
-    # 
+    #
     # More on manylinuyx at https://github.com/pypa/manylinux
     # and the pep https://www.python.org/dev/peps/pep-0513
-    # 
-    # one other thing about manylinux. Since the container contains several versions of python, 
-    # we build/test against all of them at the same time. I have it set up to run against 
+    #
+    # one other thing about manylinux. Since the container contains several versions of python,
+    # we build/test against all of them at the same time. I have it set up to run against
     # cp27-cp27m, cp27-cp27mu, cp33-cp33m, cp34-cp34m, cp35-cp35m, cp36-cp36m
-    # PYENV versions isn't relevent here so just keep it at 3.6.1 
+    # PYENV versions isn't relevent here so just keep it at 3.6.1
     - env: TARGET=i686-unknown-linux-gnu PYENV=3.6.1 WHEELPLATFORM=manylinux1_i686
-    - env: TARGET=stable-x86_64-unknown-linux-gnu PYENV=3.6.1 WHEELPLATFORM=manylinux1_x86_64
+    - env: TARGET=x86_64-unknown-linux-gnu PYENV=3.6.1 WHEELPLATFORM=manylinux1_x86_64
 
-    #  Note that musl isn't covered by manylinux and I had trouble building 
+    #  Note that musl isn't covered by manylinux and I had trouble building
     #  dylibs with it as well
     # - env: TARGET=i686-unknown-linux-musl PYENV=2.7.13 WHEELPLATFORM=
     # - env: TARGET=i686-unknown-linux-musl PYENV=3.6.1 WHEELPLATFORM=
@@ -46,8 +48,8 @@ matrix:
 
     # OSX
     # See versions https://docs.travis-ci.com/user/osx-ci-environment/#OS-X-Version
-    # current default is osx_image: xcode7.3 OS X 10.11 
-    # 
+    # current default is osx_image: xcode7.3 OS X 10.11
+    #
     - env: TARGET=x86_64-apple-darwin PYENV=2.7.13 WHEELPLATFORM=macosx_10_11_x86_64
       os: osx
       osx_image: xcode7.3
@@ -92,7 +94,7 @@ install:
   - source ~/.cargo/env || true
 
 script:
-  - bash ci/script.sh 
+  - bash ci/script.sh
 
 after_script: set +e
 
@@ -105,7 +107,7 @@ deploy:
  - provider: pypi
    distributions: bdist_wheel
    user: mckaymatt
-   password: 
+   password:
      secure: gw5UUxAkCTOWQCcRqavrsjPNxGHDqZr1tej0Y6GzKq6DMDxcvAH36lHdP596eRUfIs20ZZcaUz9+y1DBL8cFleghLBMKHnjH9AMx5p5SMRxItkuERRE5zCsAASEf7W5z5bzR9PWoUsLXbQdR9eTaWn2JYHU00MC5RmPfH8+NAItP2xCjTX/JFqg/pXPHc0uKz5ijwDaFASF/+1zDaqHrU4SdS47o/17jQsmMOwYUMn4htfHWYFnB6dktrTlPeiCFV1qA4HntnVnm6Bls2J7THPkyZmHE1GnGTLhKhqlL/IUAHdRzQuPvcEpWwsgmwjgWbz8ccBdDVOh4n4KBRGxM+NlY0H3VZICRCI/r8aT/3M7FX5tQp5s1Cl8IDD7SHRcu6EsJKjubmntX/7/GFrMvEiIx342bA8ohFklAeZftlnaf9JSdZqvAj0NKi7K96B7BfajGEhFkd02GlC0/2uQGlZI4MajDcYd2cHB/qUvIKbRVXzkV1nFiwHD3g6PGCvFYYK+F+PCacPiz17ANuETaQgGJ6WpRV+zwTAlmmAWaAcUBdBkYkUamaQNtjIXvZCqqe0P0AX38bYJG+qXsLRL+TceZ3P0Pn8iaBkgn7VmRLq1jMio5zf6eIHQU6BENXsI1+3an2O1nLgB1TfatukMyIoORezWfQliTrkLnaP1Pmz8=
    on:
      tags: true
@@ -137,7 +139,7 @@ before_cache:
   - chmod -R a+r $HOME/.cargo
   - chmod -R a+r $HOME/.rustup
   - chmod -R a+r $HOME/.manylinux_pip_cache
-  - chmod -R a+r $HOME/.manylinux_rustup_cache  
+  - chmod -R a+r $HOME/.manylinux_rustup_cache
   - chmod -R a+r $HOME/.manylinux_cargo_cache
 
 
@@ -149,7 +151,7 @@ cache:
     - $HOME/.cargo
     - $HOME/.rustup
     - $HOME/.manylinux_pip_cache
-    - $HOME/.manylinux_rustup_cache  
+    - $HOME/.manylinux_rustup_cache
     - $HOME/.manylinux_cargo_cache
 
 
@@ -164,4 +166,4 @@ notifications:
     recipients:
       - mckaymatt@gmail.com
     on_success: never
-    on_failure: always # default: always
+    on_failure: never # default: always

ci/install.sh

@@ -21,17 +21,17 @@ main() {
     fi
 
     # This fetches latest stable release
-    local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \
-                       | cut -d/ -f3 \
-                       | grep -E '^v[0.1.0-9.]+$' \
-                       | $sort --version-sort \
-                       | tail -n1)
+    # local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \
+    #                    | cut -d/ -f3 \
+    #                    | grep -E '^v[0.1.0-9.]+$' \
+    #                    | $sort --version-sort \
+    #                    | tail -n1)
     curl -LSfs https://japaric.github.io/trust/install.sh | \
         sh -s -- \
            --force \
            --git japaric/cross \
-           --tag $tag \
+           --tag 'v0.1.10' \
            --target $target
 }
 
-main
+# main

ci/manylinux_build_wheel.sh

@@ -21,8 +21,8 @@ function rust_build() {
     curl https://sh.rustup.rs -sSf > /tmp/rustup.sh
     sh /tmp/rustup.sh -y
     source $HOME/.cargo/env
-    rustup install "nightly-$TARGET"
-    rustup default "nightly-$TARGET"
+    rustup install "stable-$TARGET"
+    rustup default "stable-$TARGET"
     rustup update
 
     cd /io/trust_pypi_example/rust/

ci/script.sh

@@ -2,6 +2,9 @@
 
 set -ex
 
+# This builds "manylinux" python packages in the manylinux docker container
+# More on manylinuyx at https://github.com/pypa/manylinux
+# and the pep https://www.python.org/dev/peps/pep-0513
 manylinux_linux() {
     # cache pip packages used in docker
     mkdir -p "$HOME/.manylinux_pip_cache"
@@ -11,22 +14,34 @@ manylinux_linux() {
     CACHES="-v $HOME/.manylinux_pip_cache:/root/.cache/pip \
            -v $HOME/.manylinux_cargo_cache:/root/.cargo \
            -v $HOME/.manylinux_rustup_cache:/root/.rustup " 
-    # SUB='-v /home/matt/workspace/auditwheel/auditwheel/wheeltools.py:/opt/python/cp36-cp36m/lib/python3.6/site-packages/auditwheel/wheeltools.py'
-    docker run --rm -e TARGET="${TARGET}" $CACHES -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/ci/manylinux_build_wheel.sh
+
+    # WHEELPLATFORM is either "manylinux1_i686" or "manylinux1_x86_64"
+    docker run --rm -e TARGET="${TARGET}" -e RUSTRELEASE="${RUSTRELEASE}" $CACHES -v `pwd`:/io "quay.io/pypa/${WHEELPLATFORM}" /io/ci/manylinux_build_wheel.sh
 
 }
 
+# This is for OSX mainly. It gets python from Pyenv and uses Rustup for getting rustc. 
+# it could also be used for testing on other nixes
 pyenv_build_test_bundle() {
     # This uses cross and Pyenv
+    curl https://sh.rustup.rs -sSf > /tmp/rustup.sh
+    sh /tmp/rustup.sh -y
+    source $HOME/.cargo/env
+    rustup install "${RUSTRELEASE}-${TARGET}"
+    rustup default "${RUSTRELEASE}-${TARGET}"
+    rustup update
 
     pushd trust_pypi_example/rust/
-    cross build --target $TARGET --release
+    cargo build --target $TARGET --release
+    # pushd trust_pypi_example/rust/
+    # cross build --target $TARGET --release
 
     # disable tests
     if [ ! -z $DISABLE_TESTS ]; then
         echo "Rust Tests Disabled"
     else
-        cross test --target $TARGET --release
+        cargo test --target $TARGET --release
+        # cross test --target $TARGET --release
     fi
     # uncomment if creating a bin
     # cross run --target $TARGET
@@ -35,7 +50,7 @@ pyenv_build_test_bundle() {
     # hack 
     # move target/$TARGET/release to target/release to make
     # it easier to locate for py dist. See trust_pypi_example.py
-    if [ ! -d "target/$TARGET/release" ]; then
+    if [ ! -d "target/${TARGET}/release" ]; then
         echo "Cannot find release dir at target/$TARGET/release"
         exit 2
     else
@@ -66,13 +81,25 @@ if [ -z ${TARGET+x} ]; then
     echo "TARGET is not set. Defaulting to x86_64-unknown-linux-gnu"
     export TARGET='x86_64-unknown-linux-gnu'
     # This is for local testing. You can change the default to match your system.
-
 else 
     echo "TARGET is $TARGET"
 fi
 
 
-if [ $TRAVIS_OS_NAME = "osx" ]; then
+if [ -z ${RUSTRELEASE+x} ]; then
+    if [ ! -z ${TRAVIS_BUILD_NUMBER+x} ]; then
+        echo "RUSTRELEASE not set but it looks like this is running on Travis."
+        exit 2
+    fi
+    echo "RUSTRELEASE is not set. Defaulting to stable"
+    export RUSTRELEASE=stable
+    # This is for local testing. You can change the default to match your system.
+else 
+    echo "RUSTRELEASE is $RUSTRELEASE"
+fi
+
+
+if [ "$TRAVIS_OS_NAME" == "osx" ]; then
     pyenv_build_test_bundle
 else
     manylinux_linux