Merge branch 'travis' into 'master'

Travis CI

See merge request mbernard/abx!2

Author: Mathieu Bernard

.gitignore

@@ -38,9 +38,9 @@ pip-delete-this-directory.txt
 htmlcov/
 .tox/
 .coverage*
+coverage.xml
 .cache
 nosetests.xml
-coverage.xml
 
 # Translations
 *.mo

.travis.yml

@@ -1,4 +1,7 @@
+dist: xenial  # required for python-3.7
+
 language: python
+
 python:
     - "2.7"
     - "3.6"
@@ -16,36 +19,48 @@ branches:
   only:
     - master
 
+# conda installation is cached to avoid redowloading again and again
+# miniconda and Python dependencies
+cache:
+  directories:
+    - $HOME/miniconda
+
+# exclude some directories from cache (packaged archives and temp
+# directories)
+before_cache:
+  - rm -rf $HOME/miniconda/locks
+  - rm -rf $HOME/miniconda/pkgs
+  - rm -rf $HOME/miniconda/var
+  - rm -rf $HOME/miniconda/conda-meta/history
+
 before_install:
-  # Setup anaconda
+  # setup Python version
   - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
-      export PYTHON_MAJOR=2
+      export PYTHON_MAJOR=2;
     else
-      export PYTHON_MAJOR=3
+      export PYTHON_MAJOR=3;
+    fi
+  # setup conda (if not already cached)
+  - if test -e $HOME/miniconda/bin; then
+      echo "miniconda already installed.";
+    else
+      wget https://repo.continuum.io/miniconda/Miniconda${PYTHON_MAJOR}-latest-Linux-x86_64.sh -O miniconda.sh;
+      bash miniconda.sh -b -u -p $HOME/miniconda;
     fi
-  - wget https://repo.continuum.io/miniconda/Miniconda${PYTHON_MAJOR}-latest-Linux-x86_64.sh -O miniconda.sh
-  - bash miniconda.sh -b -p $HOME/miniconda
   - export PATH="$HOME/miniconda/bin:$PATH"
   - conda update -q --yes conda
 
-  # Useful for debugging any issues with conda
-  - conda info -a
-
-  # The next line fix a crash with multiprocessing on Travis
-  # and are not specific to using Miniconda
-  - sudo rm -rf /dev/shm && sudo ln -s /run/shm /dev/shm
-
 install:
   - if [[ "$PYTHON_MAJOR" == 2 ]]; then
-      sed -i -r 's/python.+/python=2.7/' environment.yml
+      sed -i -r 's/python.+/python=2.7/' environment.yml;
     fi
-  - conda env create -n test-environment --yes -f environment.yml
-  - source activate test-environment
+  - conda env create -n test -f environment.yml
+  - source activate test
   - pip install codecov
-  - make install
+  - python setup.py install
 
 script:
-  - make test
+  - python setup.py test
 
 after_success:
   - codecov

Makefile

@@ -30,3 +30,4 @@ clean:
 	find . -name __pycache__ -exec rm -rf {} +
 	rm -rf .eggs *.egg-info
 	rm -rf ABXpy/distances/metrics/dtw/*.c
+	rm -rf build dist htmlcov .coverage*

setup.py

@@ -23,6 +23,10 @@ def finalize_options(self):
 
     packages=setuptools.find_packages(exclude='test'),
 
+    # needed for cython/setuptools, see
+    # http://docs.cython.org/en/latest/src/quickstart/build.html
+    zip_safe=False,
+
     setup_requires=[
         'cython',
         'setuptools>=18.0',

test/test_dtw.py

@@ -7,6 +7,7 @@
 def test_small():
     res = dtw._dtw(1, 1, np.ones((1, 1)), normalized=False)
     assert res == 1
+
     res = dtw._dtw(1, 1, np.ones((1, 1)), normalized=True)
     assert res == 1