Merge branch 'release/v0.4.0'

.travis.yml

@@ -11,15 +11,15 @@ matrix:
   include:
     - env: TEST=standard
       os: linux
-    - env: TEST=minimal
-      os: linux
-    - env: TEST=examples
+    - env: TEST=flake
       os: linux
+    # - env: TEST=examples
+    #   os: linux
     # - env: TEST=standard
     #   os: osx
     #   language: generic
   allow_failures:
-    - env: TEST=minimal
+    - env: TEST=flake
 
 
 before_install:
@@ -46,11 +46,11 @@ install:
     - source activate testenv
     # Install dependencies :
     - if [ "${TEST}" == "standard" ]; then
-        pip install codecov pytest pytest-cov pytest-sugar pytest-travis-fold openpyxl;
+        pip install codecov pytest pytest-cov pytest-sugar pytest-travis-fold openpyxl xlrd;
         pip install mne nibabel pandas tensorpac;
         pip install git+https://github.com/hbldh/lspopt.git#egg=lspopt;
       fi;
-    - if [ "${TEST}" == "minimal" ]; then
+    - if [ "${TEST}" == "flake" ]; then
         pip install flake8 pep8-naming;
       fi;
     # - pip install PyOpenGL PyOpenGL_accelerate
@@ -69,7 +69,7 @@ before_script:
 script:
     - if [[ "${TEST}" == "standard" ]]; then
           py.test --cov;
-      elif [[ "${TEST}" == "minimal" ]]; then
+      elif [[ "${TEST}" == "flake" ]]; then
           flake8;
       elif [[ "${TEST}" == "examples" ]]; then
           make examples;

README.rst

@@ -3,7 +3,7 @@
 .. image:: https://travis-ci.org/EtienneCmb/visbrain.svg?branch=master
     :target: https://travis-ci.org/EtienneCmb/visbrain
 
-.. image:: https://ci.appveyor.com/api/projects/status/fdxhhmpagms1so8l?svg=true
+.. image:: https://ci.appveyor.com/api/projects/status/fdxhhmpagms1so8l/branch/master?svg=true
     :target: https://ci.appveyor.com/project/EtienneCmb/visbrain/branch/master
 
 .. image:: https://circleci.com/gh/EtienneCmb/visbrain/tree/master.svg?style=svg

appveyor.yml

@@ -1,29 +1,38 @@
 build: false
 
+cache:
+  #- packages
+
+platform:
+    -x64
+
 environment:
   matrix:
     - PYTHON_VERSION: 3.6
       MINICONDA: C:\Miniconda36-x64
+      PYTHON_ARCH: 64
 
 init:
-  - "ECHO %PYTHON_VERSION% %MINICONDA%"
+  - "ECHO %PYTHON_VERSION% %MINICONDA% %PYTHON_ARCH%"
 
 install:
   - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-desktop.ps1'))
   # - ps: $screen_resolution = '1280x800'; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-desktop.ps1'))
   # ------------------- PYTHON ENVIRONNEMENT -------------------
   - "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%"
-  - conda config --set always_yes yes --set changeps1 no
-  - conda update -q conda
-  - conda info -a
+  - "conda config --set always_yes yes --set changeps1 no"
+  - "conda update -q conda"
+  - "conda info -a"
   - "conda create -q -n testenv python=%PYTHON_VERSION% numpy scipy matplotlib pip"
   # Activate testing environnement :
-  - activate testenv
+  - "activate testenv"
+  - "python -m pip install --upgrade pip"
   # Install dependencies :
-  - pip install mne nibabel setuptools PyOpenGL PyOpenGL_accelerate pytest pytest-cov pytest-sugar pandas openpyxl tensorpac
-  - pip install git+https://github.com/hbldh/lspopt.git#egg=lspopt
+  - "pip install mne nibabel setuptools PyOpenGL PyOpenGL_accelerate pytest pandas openpyxl tensorpac xlrd"
+  - "pip install git+https://github.com/hbldh/lspopt.git#egg=lspopt"
+  - "dir"
   # ------------------- VISBRAIN -------------------
-  - pip install -e .
+  - "python setup.py develop"
 
 test_script:
-  - py.test --cov 
+  - "pytest"

circle.yml

@@ -2,9 +2,6 @@ general:
   branches:
     ignore:
       - gh-pages
-    only:
-      - master
-      - develop
 
 
 machine:
@@ -42,8 +39,8 @@ dependencies:
         echo "Conda env already set up.";
       fi;
     - conda install -n circleenv --yes numpy scipy pip;
-    - pip install codecov pytest pytest-cov pytest-travis-fold;
-    - pip install mne nibabel pandas openpyxl tensorpac;
+    - pip install pytest pytest-travis-fold;
+    - pip install mne nibabel pandas openpyxl tensorpac xlrd;
     - pip install git+https://github.com/hbldh/lspopt.git#egg=lspopt;
     - ls -al /home/ubuntu/miniconda3;
     - ls -al /home/ubuntu/miniconda3/bin;
@@ -58,6 +55,5 @@ dependencies:
 
 test:
   override:
-    - py.test --cov;
-  post:
-    - codecov;
+    - py.test:
+        timeout: 1500

docs/changelog_futur.rst

@@ -6,6 +6,23 @@ Changelog and future directions
 Changelog
 ---------
 
+v0.4.0
+^^^^^^
+
+Visbrain
+~~~~~~~~
+
+* Fixed compatibility with numpy and pip
+
+Sleep
+~~~~~
+
+* Hypnogram is now exported as a .txt file with stage-duration encoding.
+* .xlsx and EDF+ are now supported for hypnogram
+* Better gestion of units when loading with MNE
+* Fixed warning in UTF-8 file loading
+* Improved JSON saving for configuration file
+
 v0.3.8
 ^^^^^^
 

docs/index.rst

@@ -1,7 +1,7 @@
 .. image:: https://travis-ci.org/EtienneCmb/visbrain.svg?branch=master
     :target: https://travis-ci.org/EtienneCmb/visbrain
 
-.. image:: https://ci.appveyor.com/api/projects/status/fdxhhmpagms1so8l?svg=true
+.. image:: image:: https://ci.appveyor.com/api/projects/status/fdxhhmpagms1so8l/branch/master?svg=true
     :target: https://ci.appveyor.com/project/EtienneCmb/visbrain/branch/master
 
 .. image:: https://circleci.com/gh/EtienneCmb/visbrain/tree/master.svg?style=svg