Changeset 8197dbd

Timestamp:

Jul 2, 2020, 11:48:29 AM (4 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/cnn, feature/crepe, fix/ffmpeg5, master

Children:

67c06d8

Parents:

4c9aa80 (diff), 66e8265 (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 branch 'master' into feature/timestretch

Files:

• .appveyor.yml (modified) (2 diffs)
• .circleci/config.yml (modified) (3 diffs)
• .travis.yml (modified) (2 diffs)
• python/ext/ufuncs.c (modified) (2 diffs)
• scripts/get_waf.sh (modified) (1 diff)

.appveyor.yml

@@ -16 +16 @@
       PYTHON_ARCH: 64
 
-    - PYTHONDIR: C:\Python35
-      PYTHON_VERSION: 3.5.x
-      PYTHON_ARCH: 32
-
-    - PYTHONDIR: C:\Python35-x64
-      PYTHON_VERSION: 3.5.x
-      PYTHON_ARCH: 64
-
     - PYTHONDIR: C:\Python36
       PYTHON_VERSION: 3.6.x
@@ -38 +30 @@
     - PYTHONDIR: C:\Python37-x64
       PYTHON_VERSION: 3.7.x
+      PYTHON_ARCH: 64
+
+    - PYTHONDIR: C:\Python38
+      PYTHON_VERSION: 3.8.x
+      PYTHON_ARCH: 32
+
+    - PYTHONDIR: C:\Python38-x64
+      PYTHON_VERSION: 3.8.x
       PYTHON_ARCH: 64
 

.circleci/config.yml

@@ -67 +67 @@
           path: dist/
 
-  build-37:
+  build-latest:
     docker:
-      - image: circleci/python:3.7
+      - image: circleci/python:latest
     steps:
       - checkout
@@ -81 +81 @@
           path: dist/
 
-  build-37-nodeps:
+  build-latest-nodeps:
     docker:
-      - image: circleci/python:3.7
+      - image: circleci/python:latest
     steps:
       - checkout
@@ -101 +101 @@
       - build-27
       - build-36
-      - build-37
-      - build-37-nodeps
+      - build-latest
+      - build-latest-nodeps

.travis.yml

@@ -3 +3 @@
 matrix:
   include:
-    - python: 3.6
+    - name: "Linux (Python 3.8)"
+      python: 3.8
       os: linux
-      compiler: gcc
-    - python: 3.5
+      distro: bionic
+    - name: "Linux (Python 3.6)"
+      python: 3.6
       os: linux
-      compiler: gcc
       env: WAFOPTS="--build-type=debug"
-    - python: 2.7
+    - name: "Linux (Python 2.7)"
+      python: 2.7
       os: linux
-      compiler: gcc
-    - python: "pypy3.5"
+      distro: trusty
+    - name: "Linux (Python pypy3.5)"
+      language: python
+      python: "pypy3.5"
       os: linux
-      compiler: gcc
-      env: CFLAGS="-Os" WAFOPTS="--disable-avcodec"
-    - python: 3.6
+    - name: "Linux (fftw3, no other deps)"
+      python: 3.8
       os: linux
-      compiler: gcc
-      env: CFLAGS="-Os" WAFOPTS="--disable-samplerate"
-    - python: 3.5
+      env: HAVE_AUBIO_DOUBLE=1 CFLAGS="-O3" WAFOPTS="--enable-fftw3 --disable-avcodec --disable-samplerate"
+    - name: "Linux (default, dpkg-buildflags)"
       os: linux
-      compiler: gcc
-      env: HAVE_AUBIO_DOUBLE=1 CFLAGS="-O3" WAFOPTS="--enable-fftw3"
-    - python: 2.7
-      os: linux
-      compiler: gcc
       env: CFLAGS="`dpkg-buildflags --get CFLAGS`" LDFLAGS="`dpkg-buildflags --get LDFLAGS`"
-    - language: C
+
+    - name: "macOS (xcode11)"
+      language: shell
       os: osx
-      compiler: clang
-    - language: C
+      osx_image: xcode11
+    - name: "macOS (xcode12, lib only)"
+      language: shell
       os: osx
-      compiler: clang
-      env: CFLAGS="-Os" HAVE_AUBIO_DOUBLE=1 WAFOPTS="--disable-accelerate"
-    - language: C
+      osx_image: xcode12
+      script:
+        - make test_lib_only_clean
+    - name: "macOS (xcode10, noopt, nodeps)"
+      language: shell
       os: osx
-      compiler: clang
-      env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband"
-    - language: C
+      osx_image: xcode10
+      env: CFLAGS="-Os" HAVE_AUBIO_DOUBLE=1 WAFOPTS="--disable-accelerate --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband"
+    - name: "iOS"
+      language: shell
       os: osx
-      compiler: clang
       env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband" AUBIO_NOTESTS=1
-    - language: C
+    - name: "iOSSimulator"
+      language: shell
       os: osx
-      compiler: clang
       env: WAFOPTS="--with-target-platform=iosimulator --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband" AUBIO_NOTESTS=1
 
-# use trusty
-dist: trusty
-sudo: required
+#    - name: "Windows (Python 3.8.0, lib only)"
+#      language: shell
+#      os: windows
+#      before_install:
+#        - choco install python --version 3.8.0
+#        - choco install make
+#        - python -m pip install --upgrade pip
+#      env: PATH=/c/Python38:/c/Python38/Scripts:$PATH AUBIO_NOTESTS=1
 
 addons:
@@ -79 +86 @@
     update: true
 
-before_install:
-   - |
-     if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-       export PATH="$HOME/Library/Python/2.7/bin/:$PATH"
-     fi;
-
 install:
-  - |
-    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      alias pip=pip2
-    fi;
-  - travis_retry pip install --upgrade pip
-  - travis_retry make getwaf expandwaf deps_python
+  - make getwaf deps_python
   - which pip
   - pip --version

python/ext/ufuncs.c

@@ -4 +4 @@
 typedef smpl_t (*aubio_unary_func_t)(smpl_t input);
 
-static void aubio_PyUFunc_d_d(char **args, npy_intp *dimensions,
-                            npy_intp* steps, void* data)
+static void aubio_PyUFunc_d_d(char **args, const npy_intp *dimensions,
+                            const npy_intp* steps, void* data)
 {
     npy_intp i;
@@ -23 +23 @@
 }
 
-static void aubio_PyUFunc_f_f_As_d_d(char **args, npy_intp *dimensions,
-                            npy_intp* steps, void* data)
+static void aubio_PyUFunc_f_f_As_d_d(char **args, const npy_intp *dimensions,
+                            const npy_intp* steps, void* data)
 {
     npy_intp i;

scripts/get_waf.sh

@@ -4 +4 @@
 #set -x
 
-WAFVERSION=2.0.17
+WAFVERSION=2.0.20
 WAFTARBALL=waf-$WAFVERSION.tar.bz2
 WAFURL=https://waf.io/$WAFTARBALL