Merge pull request #66 from CPJKU/release/0.12.1

add Python2/3 compatibility to setup.py; bump version to 0.12.1

Author: Sebastian Böck

Diff for: .travis.yml

@@ -0,0 +1,32 @@
+language: python
+sudo: required
+dist: trusty
+python:
+  - "2.7"
+before_install:
+  # get a working ffmpeg
+  - sudo add-apt-repository --yes ppa:mc3man/trusty-media
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq ffmpeg
+  # install numpy etc. via miniconda
+  - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
+        wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
+    else
+        wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+    fi
+  - bash miniconda.sh -b -p $HOME/miniconda
+  - export PATH="$HOME/miniconda/bin:$PATH"
+  - hash -r
+  - conda config --set always_yes yes --set changeps1 no
+  - conda update -q conda
+  - conda config --add channels pypi
+  - conda info -a
+  - deps='pip cython numpy scipy nose pep8'
+  - conda create -q -n test-environment "python=$TRAVIS_PYTHON_VERSION" $deps
+  - source activate test-environment
+install:
+  - pip install -e .
+before_script:
+  - pep8 --ignore=E402 madmom bin
+script:
+  - nosetests

Diff for: setup.py

@@ -10,11 +10,12 @@
 from distutils.extension import Extension
 from Cython.Distutils import build_ext
 
+import io
 import glob
 import numpy as np
 
 # define version
-version = '0.12'
+version = '0.12.1'
 
 # define which extensions need to be compiled
 extensions = [Extension('madmom.ml.rnn',
@@ -58,11 +59,19 @@
                     'scipy>=0.14',
                     'cython>=0.22.1']
 
+# obtain a long description from README
+try:
+    # needed to be able to read unicode files in Python 2 and 3
+    with io.open('README.rst', encoding='utf-8') as f:
+        long_description = f.read()
+except IOError:
+    long_description = ''
+
 # the actual setup routine
 setup(name='madmom',
       version=version,
       description='Python audio signal processing library',
-      long_description=open('README.rst').read(),
+      long_description=long_description,
       author='Department of Computational Perception, Johannes Kepler '
              'University, Linz, Austria and Austrian Research Institute for '
              'Artificial Intelligence (OFAI), Vienna, Austria',