Merge branch 'master' of https://github.com/NLeSC/mcfly

README.md

@@ -4,7 +4,6 @@
 
 [![Build Status](https://travis-ci.org/NLeSC/mcfly.svg?branch=master)](https://travis-ci.org/NLeSC/mcfly)
 [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/lv8hih1hvxbuu5f7/branch/master?svg=true)](https://ci.appveyor.com/project/NLeSC/mcfly/)
-[![Code quality](https://scrutinizer-ci.com/g/NLeSC/mcfly/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/NLeSC/mcfly/)
 [![Coverage](https://scrutinizer-ci.com/g/NLeSC/mcfly/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/NLeSC/mcfly/statistics/)
 [![PyPI](https://img.shields.io/pypi/v/mcfly.svg)](https://pypi.python.org/pypi/mcfly/)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.596127.svg)](https://doi.org/10.5281/zenodo.596127)

appveyor.yml

@@ -1,52 +1,23 @@
 build: false
 
 platform:
- - x86
  - x64
 
 environment:
  matrix:
- # Python 3.5, 64 bit (only working version according to TensorFlow docs)
- - MINICONDA: C:\Miniconda35-x64
- # Python 2.7
- - MINICONDA: C:\Miniconda
- - MINICONDA: C:\Miniconda-x64
- # Python 3.4
- - MINICONDA: C:\Miniconda3
- - MINICONDA: C:\Miniconda3-x64
  # Python 3.5, 32 bit
- - MINICONDA: C:\Miniconda35
+ - MINICONDA: C:\Miniconda35-x64
  # Python 3.6
- - MINICONDA: C:\Miniconda36
  - MINICONDA: C:\Miniconda36-x64
 
 matrix:
  exclude:
- # Python 2.7
- - MINICONDA: C:\Miniconda
- platform: x64
- - MINICONDA: C:\Miniconda-x64
- platform: x86
- # Python 3.4
- - MINICONDA: C:\Miniconda3
- platform: x64
- - MINICONDA: C:\Miniconda3-x64
- platform: x86
  # Python 3.5
  - MINICONDA: C:\Miniconda35
  platform: x64
- - MINICONDA: C:\Miniconda35-x64
- platform: x86
  # Python 3.6
  - MINICONDA: C:\Miniconda36
  platform: x64
- - MINICONDA: C:\Miniconda36-x64
- platform: x86
- allow_failures:
- - platform: x86
- - MINICONDA: C:\Miniconda-x64
- - MINICONDA: C:\Miniconda3-x64
- - MINICONDA: C:\Miniconda36-x64
 
 init:
  - "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%MINICONDA%\\Library\\bin;%PATH%"
@@ -55,10 +26,15 @@ install:
  - conda config --set always_yes yes --set changeps1 no
  - conda config --add channels conda-forge
  - conda update -q conda
- - conda install pip numpy scipy
+ - conda install pip 
+ - "pip install numpy scipy"
  - "pip install -q pytest"
- - "pip install -qr requirements.txt"
- - "pip install ."
+
+ # Added --ignore-installed in next line because of failures like in
+ # https://ci.appveyor.com/project/NLeSC/mcfly/builds/26750694/job/1klik02e6464okfc
+ # for which the used fix is suggested here: https://github.com/ContinuumIO/anaconda-issues/issues/542.
+ - "pip install -qr requirements.txt --ignore-installed"
+ - "pip install . --ignore-installed"
  - "echo done"
 
 # command to run tests, e.g. python setup.py test