From a269d84db7778515074b7f38b6c92175f9143490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Antoine=20Goudreault?=
 <felix.goudreault82@gmail.com>
Date: Tue, 13 Mar 2018 22:26:16 -0400
Subject: [PATCH] Dropped support for python 3.5  and fixed yml files

---
 .appveyor.yml | 10 +++-------
 .travis.yml   | 42 +++++++++++++-----------------------------
 bundle.py     |  2 +-
 3 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 3f0cea8..836b036 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -2,8 +2,6 @@ environment:
   matrix:
     - PYTHON_VERSION: 3.6
       MINICONDA: C:\Miniconda36
-    - PYTHON_VERSION: 3.5
-      MINICONDA: C:\Miniconda35
 init:
   - "ECHO %PYTHON_VERSION% %MINICONDA%"
   - "ECHO %APPVEYOR_REPO_TAG_NAME%"
@@ -19,10 +17,8 @@ test_script:
 build: off
 build_script:
   # build exe file using pyinstaller from main run script
-  - IF "%PYTHON_VERSION%"=="3.6" (
-      pip install pyinstaller &&
-      python bundle.py
-    )     
+  - pip install pyinstaller
+  - python bundle.py
 artifacts:
   - path: dist/auxiclean_windows.exe
     name: auxiclean_windows
@@ -32,7 +28,7 @@ artifacts:
 deploy:
   appveyor_repo_tag: true
   tag: $(APPVEYOR_REPO_TAG_NAME)
-  relsease: $(APPVEYOR_REPO_TAG_NAME)
+  release: $(APPVEYOR_REPO_TAG_NAME)
   description: ""
   provider: GitHub
   force_update: false
diff --git a/.travis.yml b/.travis.yml
index 460d06c..2ca3662 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,26 +2,19 @@ ourceast_finish: true
 language: python
 # use matrix implementation for osx build
 # this is needed to use the language:generic
-env: DEPLOY_FILE="dist/auxiclean_linux"
 matrix:
   include:
-    - os: osx
-      language: generic
-      python: 3.5
-      env: 
-        - TRAVIS_PYTHON_VERSION=3.5
-        - DEPLOY_FILE="dist/auxiclean_osx.zip"
-
     - os: osx
       language: generic
       python: 3.6
       env: 
         - TRAVIS_PYTHON_VERSION=3.6
         - DEPLOY_FILE="dist/auxiclean_osx.zip"
-os: linux
-python:
-  - 3.5
-  - 3.6
+    
+    - os: linux
+      python: 3.6
+      env: 
+        - DEPLOY_FILE="dist/auxiclean_linux"
 
 # we use python from miniconda in order to be able to create virtual environments easily
 before_install:
@@ -35,11 +28,8 @@ before_install:
   - bash miniconda.sh -b -p $HOME/miniconda;
   - export PATH="$HOME/miniconda/bin:$PATH"
   - source $HOME/miniconda/bin/activate
-  - conda update --yes conda
-  # for now, there is a bug with conda v4.3.27 on linux for pyinstaller, use the version before
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then
-      conda install --yes conda==4.3.25;
-    fi
+  # update conda for osx
+  - conda update --yes --all
   - conda create -q --yes -n test-environment python=$TRAVIS_PYTHON_VERSION
   - source activate test-environment
 # install auxiclean package
@@ -50,18 +40,18 @@ script:
   - pytest
 after_success:
   # report coverage in coveralls only for linux build with python 3.6
-  - if ([[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]] && 
-        [[ "$TRAVIS_OS_NAME" == "linux" ]]); then
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
       pip install coveralls;
     fi
-  - if ([[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]] && 
-        [[ "$TRAVIS_OS_NAME" == "linux" ]]); then
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
       coveralls;
     fi
 
 before_deploy:
-  - if [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then pip install pyinstaller; fi
-  - if [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then python bundle.py; fi
+  - pip install pyinstaller
+  # there is a bug with pyinstaller and anaconda. Reverting to python 3.6.0 when bundling seems to fix this.
+  - conda install --yes python==3.6.0
+  - python bundle.py
 deploy:
   - provider: releases
     api_key:
@@ -71,9 +61,3 @@ deploy:
     on:
       tags: true
       python: 3.6
-
-    file: $DEPLOY_FILE
-    skip_cleanup: true
-    on:
-      tags: true
-      python: 3.6
diff --git a/bundle.py b/bundle.py
index e0c28a2..28e1773 100644
--- a/bundle.py
+++ b/bundle.py
@@ -29,7 +29,7 @@
 elif platform == "darwin":
     print("Bundling for OSX.")
     os.system(osx_command)
-elif platform == "windows":
+elif platform == "win32":
     print("Bundling for Windows.")
     os.system(windows_command)
 else: