Merge branch 'daily'

matthew-brett · matthew-brett · commit 522242b79b44 · 2017-04-27T17:57:37.000+01:00
* daily:
  Fix for appveyor file
  More refactoring to make daily==master
  Another shot at daily==master refactor
  Fix syntax of else
  Try refactor to detect cron jobs
  Pin apache-libcloud to debug wheelhouse upload
  Trigger build with JT's fix
diff --git a/.travis.yml b/.travis.yml
@@ -7,14 +7,13 @@ env:
         - TEST_DEPENDS=nose
         - PLAT=x86_64
         - UNICODE_WIDTH=32
-        - MANYLINUX_URL=https://nipy.bic.berkeley.edu/manylinux
         - WHEELHOUSE_UPLOADER_USERNAME=travis-worker
         # Following generated with
         # travis encrypt -r MacPython/numpy-wheels WHEELHOUSE_UPLOADER_SECRET=<the api key>
         - secure:
             "FEFwGNflXOjuNjv4f2oOq0m8I3b6OvG5AVV/tH9Fsr6jtPNwQOx7PMOVzISBrWfAueeFubz/IapXBeDP8fRio9RVOcEHBhVJQYeJ46VubOx4X/4pRUD7ehGLxjYK30BGVdNh7z/tL6Xr5+iCuxxmOBgirG0pQVeBZXDchPJaUK0="
-        # Daily commit, if present, overrides BUILD_COMMIT
-        # - DAILY_COMMIT=master
+        # Commit when running from daily branch
+        - DAILY_COMMIT=master
 
 language: python
 # Default Python version is usually 2.7
@@ -86,12 +85,13 @@ matrix:
         - MB_PYTHON_VERSION=3.6
 
 before_install:
-    - if [ -z "$DAILY_COMMIT" ]; then
+    - if ["$TRAVIS_BRANCH" == "daily" ]; then
+          CONTAINER="pre-release";
+          BUILD_COMMIT=${DAILY_COMMIT:-$BUILD_COMMIT};
+          NPY_RELAXED_STRIDES_DEBUG=1;
+      else
           CONTAINER=wheels;
           UPLOAD_ARGS="--no-update-index";
-      else
-          CONTAINER="pre-release";
-          BUILD_COMMIT=$DAILY_COMMIT;
       fi
     - source multibuild/common_utils.sh
     - source multibuild/travis_steps.sh
@@ -110,6 +110,5 @@ after_success:
     - pip install wheelhouse-uploader
     - python -m wheelhouse_uploader upload --local-folder
           ${TRAVIS_BUILD_DIR}/wheelhouse/
-          --no-update-index
           $UPLOAD_ARGS
           $CONTAINER
diff --git a/appveyor.yml b/appveyor.yml
@@ -12,6 +12,7 @@ environment:
       WHEELHOUSE_UPLOADER_SECRET:
         secure:
             9s0gdDGnNnTt7hvyNpn0/ZzOMGPdwPp2SewFTfGzYk7uI+rdAN9rFq2D1gAP4NQh
+      DAILY_COMMIT: master
 
     matrix:
 
@@ -48,6 +49,15 @@ environment:
       PYTHON_ARCH: "64"
 
 install:
+  - ps: >-
+      if ($env:APPVEYOR_REPO_BRANCH -eq "daily") {
+        $env:CONTAINER = "pre-release"
+        if ($env:DAILY_COMMIT) { $env:BUILD_COMMIT = $env:DAILY_COMMIT }
+        $env:NPY_RELAXED_STRIDES_DEBUG = 1
+      } else {
+        $env:CONTAINER = "wheels"
+        $env:UPLOAD_ARGS = "--no-update-index"
+      }
   - cmd: echo "Filesystem root:"
   - dir C:\
 
@@ -106,5 +116,6 @@ on_success:
   # disable the ssl checks.
   - pip install wheelhouse-uploader
   - python -m wheelhouse_uploader upload
-    --no-ssl-check --local-folder=dist --no-update-index
-    wheels
+    --no-ssl-check --local-folder=dist
+    %UPLOAD_ARGS%
+    %CONTAINER%
