ref: 8197dbdf7b3a3891c761db3acaaadb247e720b3c
parent: 4c9aa80c2088fb8dd737ba2a01a3ee432605892b
parent: 66e82657ef5a40dde58d77a4a69a1b24116d7f9e
author: Paul Brossier <piem@piem.org>
date: Thu Jul 2 07:48:29 EDT 2020
Merge branch 'master' into feature/timestretch
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -15,14 +15,6 @@
PYTHON_VERSION: 2.7.x
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
PYTHON_ARCH: 32
@@ -37,6 +29,14 @@
- 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
install:
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -66,9 +66,9 @@
- store_artifacts:
path: dist/
- build-37:
+ build-latest:
docker:
- - image: circleci/python:3.7
+ - image: circleci/python:latest
steps:
- checkout
- run: *apt-install
@@ -80,9 +80,9 @@
- store_artifacts:
path: dist/
- build-37-nodeps:
+ build-latest-nodeps:
docker:
- - image: circleci/python:3.7
+ - image: circleci/python:latest
steps:
- checkout
- run: *pip-install
@@ -100,5 +100,5 @@
jobs:
- build-27
- build-36
- - build-37
- - build-37-nodeps
+ - build-latest
+ - build-latest-nodeps
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,55 +2,62 @@
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:
apt:
@@ -78,19 +85,8 @@
- lcov
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
- pip install coverage
--- a/python/ext/ufuncs.c
+++ b/python/ext/ufuncs.c
@@ -3,8 +3,8 @@
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;
npy_intp n = dimensions[0];
@@ -22,8 +22,8 @@
}
}
-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;
npy_intp n = dimensions[0];
--- a/scripts/get_waf.sh
+++ b/scripts/get_waf.sh
@@ -3,7 +3,7 @@
set -e
#set -x
-WAFVERSION=2.0.17
+WAFVERSION=2.0.20
WAFTARBALL=waf-$WAFVERSION.tar.bz2
WAFURL=https://waf.io/$WAFTARBALL
WAFUPSTREAMKEY=https://gitlab.com/ita1024/waf/raw/master/utils/pubkey.asc