From 3b18f422e2d94fd1a67655bcc1b4904b3e098e4d Mon Sep 17 00:00:00 2001
From: fgoudreault <felix.goudreault82@gmail.com>
Date: Wed, 19 Jul 2017 14:02:43 -0400
Subject: [PATCH] fix automatic windows deploy

Now, when an appveyor builds succeeds on the master branch (when a merge
is done), a draft release is automatically created on github with an
uploaded zip file containing the windows build.
---
 .appveyor.yml | 26 ++++++++++++++++----------
 build.py      |  9 ++++++---
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index ff6a919..728bad2 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,11 +1,10 @@
-build: false
-
 environment:
   matrix:
     - PYTHON_VERSION: 3.6
       MINICONDA: C:\Miniconda36
 init:
   - "ECHO %PYTHON_VERSION% %MINICONDA%"
+  - "ECHO %APPVEYOR_REPO_TAG_NAME%"
 install:
   - "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%"   
   - conda update --yes conda
@@ -14,19 +13,26 @@ install:
   - python setup.py develop
 test_script:
   - python tests.py
-branches:
-  only:
-  - master
-  - develop
-before_deploy:
+# build is done in build_script
+build: off
+build_script:
   - python build.py bdist_msi
+artifacts:
+  - path: auxiclean_windows.zip
+    name: auxiclean_windows
+
+# deploy only when making a new release on master branch
+# the windows build will be uploaded into the new release.
 deploy:
-  release: $(appveyor_build_version)
-  description: "Release description"
+  appveyor_repo_tag: true
+  tag: $(APPVEYOR_REPO_TAG_NAME)
+  relsease: $(APPVEYOR_REPO_TAG_NAME)
+  description: ""
   provider: GitHub
+  force_update: false
   auth_token:
     secure: x2ous7RX857j64h4DSkiEBCSU8kUQYCL31UBrPLUSgosixVS/XDXGA6TWr0DLPm9
-  artifact: auxiclean.zip
+  artifact: auxiclean_windows
   draft: true
   on:
     branch: master
diff --git a/build.py b/build.py
index a4aee9e..edd377b 100644
--- a/build.py
+++ b/build.py
@@ -28,11 +28,14 @@
 
 executables = [Executable("run.py", base=base, targetName="auxiclean.exe")]
 version = versioneer.get_version()
-short = version[:version.find("+")].strip("v")
+short = version.strip("v")
+if "+" in version:
+    short = version[:version.find("+")].strip("v")
 setupcx(name="auxiclean",
         version=short,
         executables=executables,
-        options={"build_exe": {"include_files": include_files}})
+        options={"build_exe": {"include_files": include_files,
+                               "silent": True}})
 
 # find directory and zip it
 dirs = os.listdir("build")
@@ -44,4 +47,4 @@
         break
 if tozip is None:
     raise FileNotFoundError("build directory not found")
-shutil.make_archive("auxiclean", "zip", tozip)
+shutil.make_archive("auxiclean_windows", "zip", tozip)