Merge branch 'fix(appveyor)'

Author: cfobel

.appveyor/build.ps1

@@ -18,7 +18,7 @@ $env:project_directory = (Get-Item -Path ".\" -Verbose).FullName
 Write-Host "Project directory: $($env:project_directory)"
 
 # Build Package
-conda build .conda-recipe --dirty --croot bld -m .conda-recipe\variants.yaml
+conda build .conda-recipe --dirty --croot bld
 $exit_code = $?
 echo $exit_code
 if (!$exit_code) { $build_status = "Failed Conda Build Stage" }
@@ -46,6 +46,16 @@ echo $build_status > BUILD_STATUS
 # Set exit code to 1 if package(s) weren't built.
 if (!$packages_built) { exit 1 }
 
+# Check for broken packages.
+Get-ChildItem bld\*\*.tar.bz2 | `
+  Select-Object Name, @{ n = 'Folder'; e = { Convert-Path $_.PSParentPath } },
+    @{ n = 'Foldername'; e = { ($_.PSPath -split '[\\]')[-2] } },
+    FullName | ForEach {
+      if ($_.Foldername -eq "broken") {
+        exit 1
+      }
+    }
+
 # Prepend platform (i.e., `win-32`, `win-64`, `noarch`) to each package filename
 # and collect package files in `artifacts` directory.
 md artifacts
@@ -54,5 +64,7 @@ Get-ChildItem bld\*\*.tar.bz2 | `
     @{ n = 'Foldername'; e = { ($_.PSPath -split '[\\]')[-2] } },
     FullName | ForEach {
       echo "$($_.FullName.Trim()) -> artifacts\$($_.Foldername)-$($_.Name)"
+      # Upload to `nadamq` Anaconda Cloud channel (only non-broken packages).
+      anaconda -t $env:anaconda_token upload -u nadamq $_.FullName.Trim()
       mv $($_.FullName.Trim()) artifacts\$($_.Foldername)-$($_.Name)
     }

.appveyor/install.ps1

@@ -24,5 +24,18 @@ conda install -n root -c pscondaenvs pscondaenvs
 conda update -q conda
 conda install --yes conda-build anaconda-client nose
 
-# Create and activate new project environment
-conda create --name $env:APPVEYOR_PROJECT_NAME python
+# Create new project environment
+conda create --name $env:APPVEYOR_PROJECT_NAME python anaconda-client
+
+# Use patch (from `conda-build`) to support Appveyor Python 2.7 win-64 build.
+if ($env:ARCH -eq "x64") {
+  conda install --yes curl 7za
+  activate
+  # Download patch to support Appveyor Python 2.7 win-64 build.
+  cmd /C curl -L -o conda-build-3.7.1.zip https://github.com/conda/conda-build/archive/3.7.1.zip
+  # Extract patch.
+  7za x .\conda-build-3.7.1.zip conda-build-3.7.1\ci\appveyor
+  # Apply patch.
+  & conda-build-3.7.1\ci\appveyor\setup_x64.bat
+  copy "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars64.bat" "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\amd64\vcvarsamd64.bat"
+}

.conda-recipe/meta.yaml

@@ -56,8 +56,6 @@ build:
 
 requirements:
   build:
-    #: .. versionadded:: 0.15
-    - {{ compiler('c') }}
     - ragel >=6.10
     - msinttypes  # [win and py2k]
 
@@ -92,6 +90,9 @@ outputs:
     noarch: generic
     files:
       - share
+    requirements:
+      run:
+        - c-array-defs >=1.3
   - name: nadamq
     files:
       - Lib/site-packages/{{ MODULE_NAME }}
@@ -102,7 +103,6 @@ outputs:
         - future
         #: .. versionchanged:: 0.15
         - python
-        - c-array-defs >=1.3
         - numpy
         #: .. versionadded:: 0.14
         - or-event >=0.2.1

.conda-recipe/variants.yaml

@@ -18,14 +18,26 @@ init:
 
     Write-Host $env:PATH
 environment:
+  anaconda_token:
+    secure: ZpLQ+IMirVuHrEkZPevDFTZ4AeUuDtLm5d4KTCwgI5oIB5eJxP5OLDYFKwud7K89
   CONDA_EXTRA_CHANNELS: cfobel
   matrix:
-  - PYTHON_VERSION: 3.6
-    MINICONDA: C:\Miniconda3
+  - PYTHON_VERSION: 2.7
+    MINICONDA: C:\Miniconda-x64
+    ARCH: x64
+    PYTHON_ARCH: 64
+  - PYTHON_VERSION: 2.7
+    MINICONDA: C:\Miniconda
     PYTHON_ARCH: 32
+    ARCH: Win32
   - PYTHON_VERSION: 3.6
-    MINICONDA: C:\Miniconda3-x64
+    MINICONDA: C:\Miniconda36-x64
+    ARCH: x64
     PYTHON_ARCH: 64
+  - PYTHON_VERSION: 3.6
+    MINICONDA: C:\Miniconda36
+    ARCH: Win32
+    PYTHON_ARCH: 32
 install:
 - ps: .appveyor/install.ps1
 build_script: