ci fixes for tests, wheel (#14)

* (1) ci fixes for tests, wheel

* update travis env

* (2) ci fixes for tests, wheel

* last test for docs

* okay, final version

Co-authored-by: Raman Prasad <[email protected]>

.travis.yml

@@ -9,8 +9,6 @@ branches:
 # all jobs should enable the release flag for compiler optimizations
 env:
   global:
-  - WHITENOISE_RELEASE=True
-  - PROTO_VERSION=3.11.4
   # Note: Without the IS_CI_BUILD set to True, the python tests will stall
   - IS_CI_BUILD=True
   - TWINE_USERNAME=__token__
@@ -27,22 +25,19 @@ jobs:
   # - XBuild pypi OS X wheel
   # -------------------------------------------------------
   - name: Build/Test Python package
-    if: branch = skipit
     os: osx
     osx_image: xcode11 # python3.7 comes installed with xcode11 image
     language: rust
     rust: stable
     install:
     - python3 -V; pip3 -V   # for debugging
     - pip3 install -U setuptools
-    - pip3 install -r requirements/ci-osx_build.txt
     script:
+    - pip3 install -r requirements/dev.txt
     # Build Rust libraries + python binaries + OS X wheel
-    - bash scripts/ci-osx_build_wheel.sh;
+    - bash scripts/build_wheel.sh;
     # Run python tests (build stops if these fail)
     - python3 -m pytest -x -v;
-    # Clean up the wheel
-    - bash scripts/ci-osx_link_wheel.sh;
     # Build the python docs
     - bash scripts/build_docs.sh;
     deploy:
@@ -56,19 +51,38 @@ jobs:
         keep_history: true
         target_branch: gh-pages
         on:
-          branch: 1-cleanup
-          #branch: test-branch
-      # -------------------------------------------------------
-      # Deploy to pypi; credentials are in env variables
-      #     - TWINE_USERNAME, TWINE_PASSWORD (using token)
-      # -------------------------------------------------------
-      #- provider: script
-      #  skip_cleanup: true
-      #  script:
-      #    python3 -m pip install --upgrade pip && python3 -m pip install twine && python3 -m twine upload --non-interactive --verbose --skip-existing wheelhouse/*
-      #  on:
-      #    branch: master
-      #    #branch: test-branch
+          branch: master
 
-# Manylinux CI build in progress
-#
+  - name: Deploy production wheel
+    if: branch = xskip-job
+    os: osx
+    osx_image: xcode11 # python3.7 comes installed with xcode11 image
+    language: rust
+    rust: stable
+    services:
+      - docker
+    addons:
+      apt:
+        update: true
+        packages:
+          - python3-pip
+    env:
+      - DOCKER_IMAGE=quay.io/pypa/manylinux2010_x86_64
+    install:
+      - docker pull $DOCKER_IMAGE
+      - chmod +x scripts/build_binaries_manylinux.sh
+    script:
+      - docker run --rm -e PLAT=$PYTHON_PLAT -v `pwd`:/io $DOCKER_IMAGE /io/scripts/build_binaries_manylinux.sh
+      - cp whitenoise-core/target/release/libwhitenoise_validator.so tmp_binaries
+      - cp whitenoise-core/target/release/libwhitenoise_runtime.so tmp_binaries
+      - python3 scripts/code_generation.py
+      - cp tmp_binaries/libwhitenoise_validator.so opendp/whitenoise/core/lib
+      - cp tmp_binaries/libwhitenoise_runtime.so opendp/whitenoise/core/lib
+      - python3 setup.py bdist_wheel -d ./wheelhouse
+    deploy:
+      skip_cleanup: true
+      provider: script
+      script:
+        python3 -m pip install --upgrade pip && python3 -m pip install twine && python3 -m twine upload --verbose --skip-existing wheelhouse/*
+      on:
+        branch: develop

scripts/build_manylinux_binaries.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# run from within the manylinux docker containers
+
+# exit immediately upon failure, print commands while running
+set -e -x
+
+# Install rust inside the manylinux container
+#
+echo ">>> install rust if it does not exist";
+if ! [ -x "$(command -v cargo)" ]; then
+  curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal
+	export PATH="${HOME}/.cargo/bin:${PATH}"
+fi
+
+echo ">>> build the binaries";
+cargo build --manifest-path=whitenoise-core/Cargo.toml

scripts/ci-osx_build_wheel.sh → scripts/build_wheel.sh

@@ -12,15 +12,15 @@ bash scripts/clean.sh
 # Generate python classes from protobuf definitions as well as
 #  components.py and variant_message_map.py files
 #
-echo "(2) Generate python classes from protobuf definitions";
+echo "(2) Generate components.py, *_pb2.py and binaries";
 python3 scripts/code_generation.py
 
 # Build the source distribution (.tar.gz as specified in the setup.cfg)
 #
-echo "(3) Build the source distribution (may skip sdist in future builds)";
-python3 setup.py sdist -d ./wheelhouse
+#echo "(3) Build the source distribution";
+#python3 setup.py sdist -d ./wheelhouse
 
 # Build the binary distribution (wheel)
 #
-echo "(4) Build the binary distribution";
+echo "(3) Build the final wheel";
 python3 setup.py bdist_wheel -d ./wheelhouse