Skip to content

Commit

Permalink
Dropped support for python 3.5
Browse files Browse the repository at this point in the history
 and fixed yml files
  • Loading branch information
fgoudreault committed Mar 14, 2018
1 parent cf0b2b1 commit a269d84
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 37 deletions.
10 changes: 3 additions & 7 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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%"
Expand All @@ -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
Expand All @@ -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
Expand Down
42 changes: 13 additions & 29 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -71,9 +61,3 @@ deploy:
on:
tags: true
python: 3.6

file: $DEPLOY_FILE
skip_cleanup: true
on:
tags: true
python: 3.6
2 changes: 1 addition & 1 deletion bundle.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit a269d84

Please sign in to comment.