Changeset 41b985f for .travis.yml

Timestamp:

Mar 12, 2017, 11:26:24 AM (7 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

sampler

Children:

bde49c4a

Parents:

71f2e5f (diff), 67b6618 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 'origin/master' into sampler

Conflicts:

.travis.yml
Makefile
examples/aubionotes.c
examples/parse_args.h
python/demos/demo_timestretch_online.py
python/lib/moresetuptools.py
python/tests/test_source.py
setup.py
src/io/source.c

File:

• .travis.yml (modified) (4 diffs)

.travis.yml

@@ -3 +3 @@
 matrix:
   include:
+    - python: 3.5
+      os: linux
+      compiler: gcc
+    - python: 3.4
+      os: linux
+      compiler: gcc
     - python: 2.7
       os: linux
       compiler: gcc
-      env: ARCH=x86_64
+    - language: C
+      os: osx
+      osx_image: xcode8
+      compiler: clang
+    - python: 3.5
+      os: linux
+      compiler: gcc
+      env: CFLAGS="-Os" WAFOPTS="--disable-samplerate --disable-sndfile"
+    - python: 3.4
+      os: linux
+      compiler: gcc
+      env: HAVE_AUBIO_DOUBLE=1 CFLAGS="-O3" WAFOPTS="--enable-fftw3"
     - python: 2.7
       os: linux
       compiler: gcc
-      env: ARCH=i386
-    - python: 3.4
-      os: linux
-      compiler: gcc
-      env: ARCH=x86_64
-    - python: 3.4
-      os: linux
-      compiler: gcc
-      env: ARCH=i386 WAFOPTS=--enable-fftw3f
+      env: CFLAGS="`dpkg-buildflags --get CFLAGS`" LDFLAGS="`dpkg-buildflags --get LDFLAGS`"
     - language: C
       os: osx
+      osx_image: xcode8
       compiler: clang
-      env: ARCH=x86_64
+      env: CFLAGS="-Os" HAVE_AUBIO_DOUBLE=1 WAFOPTS="--disable-accelerate"
     - language: C
       os: osx
+      osx_image: xcode8
       compiler: clang
-      env: ARCH=i386
-    - python: 2.7
-      os: linux
-      compiler: gcc
-      env: ARCH=x86_64 HAVE_DOUBLE=1 WAFOPTS=--enable-fftw3
-    - python: 2.7
-      os: linux
-      compiler: gcc
-      env: ARCH=i386 HAVE_DOUBLE=1
-    - python: 3.4
-      os: linux
-      compiler: gcc
-      env: ARCH=x86_64 HAVE_DOUBLE=1
-    - python: 3.4
-      os: linux
-      compiler: gcc
-      env: ARCH=i386 HAVE_DOUBLE=1
+      env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile"
     - language: C
       os: osx
+      osx_image: xcode8
       compiler: clang
-      env: ARCH=x86_64 HAVE_DOUBLE=1
+      env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband" AUBIO_NOTESTS=1
     - language: C
       os: osx
+      osx_image: xcode8
       compiler: clang
-      env: ARCH=i386 HAVE_DOUBLE=1
+      env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband" AUBIO_NOTESTS=1
     - language: C
       os: osx
+      osx_image: xcode8.2
       compiler: clang
-      env: ARCH=x86_64 WAFOPTS="--enable-fat --disable-sndfile --disable-samplerate --disable-rubberband"
+      env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile"
     - language: C
       os: osx
+      osx_image: xcode8.2
       compiler: clang
-      env: ARCH=i386 WAFOPTS="--enable-fat --disable-sndfile --disable-samplerate --disable-rubberband"
+      env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile" AUBIO_NOTESTS=1
+    - language: C
+      os: osx
+      osx_image: xcode8.2
+      compiler: clang
+      env: WAFOPTS="--with-target-platform=iosimulator --disable-avcodec --disable-sndfile" AUBIO_NOTESTS=1
+
+# use trusty
+dist: trusty
+sudo: required
 
 addons:
@@ -64 +72 @@
     packages:
     - bzip2
+    - libavcodec-dev
+    - libavformat-dev
+    - libavresample-dev
+    - libavutil-dev
     - libsndfile1-dev
     - libsamplerate-dev
@@ -76 +88 @@
      if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
        brew update
-       brew install sox libsamplerate libsndfile rubberband
+       brew install sox
+       brew install ffmpeg
+       brew install libsndfile
+       brew install libsamplerate
+       brew install rubberband
        export PATH="$HOME/Library/Python/2.7/bin/:$PATH"
      fi;
 
-
 install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then travis_retry pip install nose2; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then travis_retry pip install --user nose2; fi
+  - travis_retry pip install --upgrade pip
+  - travis_retry make getwaf expandwaf deps_python
+  - which pip
+  - pip --version
 
 script:
   - make create_test_sounds
-  - make build
-  - make build_python
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make test_python; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make test_python_osx; fi
-  - make clean_python
-  - make clean
-  - make distcheck
-  - make test_pure_python
+  - |
+    if [[ -z "$AUBIO_NOTESTS" ]]; then
+      make test_lib_python_clean
+      make test_python_only_clean
+    else
+      make test_lib_only_clean
+    fi;
 
 notifications:
@@ -101 +117 @@
             - "irc.freenode.org#aubio"
         use_notice: true
+    webhooks:
+        urls:
+            - https://webhooks.gitter.im/e/81e7733a5b1d977854b4
+        on_success: change  # options: [always|never|change] default: always
+        on_failure: always  # options: [always|never|change] default: always
+        on_start: never     # options: [always|never|change] default: always