History

Merge branch 'master' into feature/timestretch

Paul Brossier committed 6 years ago

Commit 8197dbd2 parents 4c9aa80 66e82655 files · +60 −64Browse files

Unified · Split

5 files
  1. .appveyor.yml +8 −8
  2. .circleci/config.yml +6 −6
  3. .travis.yml +41 −45
  4. python/ext/ufuncs.c +4 −4
  5. scripts/get_waf.sh +1 −1
.appveyor.yml+8−8
@@ -15,14 +15,6 @@ environment: · 14 unmodified lines
15 PYTHON_VERSION: 2.7.x15 PYTHON_VERSION: 2.7.x
16 PYTHON_ARCH: 6416 PYTHON_ARCH: 64
17 17
18 - PYTHONDIR: C:\Python35
19 PYTHON_VERSION: 3.5.x
20 PYTHON_ARCH: 32
21
22 - PYTHONDIR: C:\Python35-x64
23 PYTHON_VERSION: 3.5.x
24 PYTHON_ARCH: 64
25
26 - PYTHONDIR: C:\Python3618 - PYTHONDIR: C:\Python36
27 PYTHON_VERSION: 3.6.x19 PYTHON_VERSION: 3.6.x
28 PYTHON_ARCH: 3220 PYTHON_ARCH: 32
@@ -39,6 +31,14 @@ environment: · 10 unmodified lines
39 PYTHON_VERSION: 3.7.x31 PYTHON_VERSION: 3.7.x
40 PYTHON_ARCH: 6432 PYTHON_ARCH: 64
41 33
34 - PYTHONDIR: C:\Python38
35 PYTHON_VERSION: 3.8.x
36 PYTHON_ARCH: 32
37
38 - PYTHONDIR: C:\Python38-x64
39 PYTHON_VERSION: 3.8.x
40 PYTHON_ARCH: 64
41
42install:42install:
43 - ECHO "Installed SDKs:"43 - ECHO "Installed SDKs:"
44 - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\""44 - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\""
.circleci/config.yml+6−6
@@ -66,9 +66,9 @@ jobs: · 65 unmodified lines
66 - store_artifacts:66 - store_artifacts:
67 path: dist/67 path: dist/
68 68
69 build-37:69 build-latest:
70 docker:70 docker:
71 - image: circleci/python:3.771 - image: circleci/python:latest
72 steps:72 steps:
73 - checkout73 - checkout
74 - run: *apt-install74 - run: *apt-install
@@ -80,9 +80,9 @@ jobs: · 5 unmodified lines
80 - store_artifacts:80 - store_artifacts:
81 path: dist/81 path: dist/
82 82
83 build-37-nodeps:83 build-latest-nodeps:
84 docker:84 docker:
85 - image: circleci/python:3.785 - image: circleci/python:latest
86 steps:86 steps:
87 - checkout87 - checkout
88 - run: *pip-install88 - run: *pip-install
@@ -100,5 +100,5 @@ workflows: · 11 unmodified lines
100 jobs:100 jobs:
101 - build-27101 - build-27
102 - build-36102 - build-36
103 - build-37103 - build-latest
104 - build-37-nodeps104 - build-latest-nodeps
.travis.yml+41−45
@@ -2,55 +2,62 @@ language: python · 1 unmodified line
2 2
3matrix:3matrix:
4 include:4 include:
5 - python: 3.65 - name: "Linux (Python 3.8)"
6 python: 3.8
6 os: linux7 os: linux
7 compiler: gcc8 distro: bionic
8 - python: 3.59 - name: "Linux (Python 3.6)"
10 python: 3.6
9 os: linux11 os: linux
10 compiler: gcc
11 env: WAFOPTS="--build-type=debug"12 env: WAFOPTS="--build-type=debug"
12 - python: 2.713 - name: "Linux (Python 2.7)"
14 python: 2.7
13 os: linux15 os: linux
14 compiler: gcc16 distro: trusty
15 - python: "pypy3.5"17 - name: "Linux (Python pypy3.5)"
18 language: python
19 python: "pypy3.5"
16 os: linux20 os: linux
17 compiler: gcc21 - name: "Linux (fftw3, no other deps)"
18 env: CFLAGS="-Os" WAFOPTS="--disable-avcodec"22 python: 3.8
19 - python: 3.6
20 os: linux23 os: linux
21 compiler: gcc24 env: HAVE_AUBIO_DOUBLE=1 CFLAGS="-O3" WAFOPTS="--enable-fftw3 --disable-avcodec --disable-samplerate"
22 env: CFLAGS="-Os" WAFOPTS="--disable-samplerate"25 - name: "Linux (default, dpkg-buildflags)"
23 - python: 3.5
24 os: linux26 os: linux
25 compiler: gcc
26 env: HAVE_AUBIO_DOUBLE=1 CFLAGS="-O3" WAFOPTS="--enable-fftw3"
27 - python: 2.7
28 os: linux
29 compiler: gcc
30 env: CFLAGS="`dpkg-buildflags --get CFLAGS`" LDFLAGS="`dpkg-buildflags --get LDFLAGS`"27 env: CFLAGS="`dpkg-buildflags --get CFLAGS`" LDFLAGS="`dpkg-buildflags --get LDFLAGS`"
31 - language: C28
29 - name: "macOS (xcode11)"
30 language: shell
32 os: osx31 os: osx
33 compiler: clang32 osx_image: xcode11
34 - language: C33 - name: "macOS (xcode12, lib only)"
34 language: shell
35 os: osx35 os: osx
36 compiler: clang36 osx_image: xcode12
37 env: CFLAGS="-Os" HAVE_AUBIO_DOUBLE=1 WAFOPTS="--disable-accelerate"37 script:
38 - language: C38 - make test_lib_only_clean
39 - name: "macOS (xcode10, noopt, nodeps)"
40 language: shell
39 os: osx41 os: osx
40 compiler: clang42 osx_image: xcode10
41 env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband"43 env: CFLAGS="-Os" HAVE_AUBIO_DOUBLE=1 WAFOPTS="--disable-accelerate --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband"
42 - language: C44 - name: "iOS"
45 language: shell
43 os: osx46 os: osx
44 compiler: clang
45 env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband" AUBIO_NOTESTS=147 env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband" AUBIO_NOTESTS=1
46 - language: C48 - name: "iOSSimulator"
49 language: shell
47 os: osx50 os: osx
48 compiler: clang
49 env: WAFOPTS="--with-target-platform=iosimulator --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband" AUBIO_NOTESTS=151 env: WAFOPTS="--with-target-platform=iosimulator --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband" AUBIO_NOTESTS=1
50 52
51# use trusty53# - name: "Windows (Python 3.8.0, lib only)"
52dist: trusty54# language: shell
53sudo: required55# os: windows
56# before_install:
57# - choco install python --version 3.8.0
58# - choco install make
59# - python -m pip install --upgrade pip
60# env: PATH=/c/Python38:/c/Python38/Scripts:$PATH AUBIO_NOTESTS=1
54 61
55addons:62addons:
56 apt:63 apt:
@@ -78,19 +85,8 @@ addons: · 21 unmodified lines
78 - lcov85 - lcov
79 update: true86 update: true
80 87
81before_install:
82 - |
83 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
84 export PATH="$HOME/Library/Python/2.7/bin/:$PATH"
85 fi;
86
87install:88install:
88 - |89 - make getwaf deps_python
89 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
90 alias pip=pip2
91 fi;
92 - travis_retry pip install --upgrade pip
93 - travis_retry make getwaf expandwaf deps_python
94 - which pip90 - which pip
95 - pip --version91 - pip --version
96 - pip install coverage92 - pip install coverage
python/ext/ufuncs.c+4−4
@@ -3,8 +3,8 @@ · 2 unmodified lines
3 3
4typedef smpl_t (*aubio_unary_func_t)(smpl_t input);4typedef smpl_t (*aubio_unary_func_t)(smpl_t input);
5 5
6static void aubio_PyUFunc_d_d(char **args, npy_intp *dimensions,6static void aubio_PyUFunc_d_d(char **args, const npy_intp *dimensions,
7 npy_intp* steps, void* data)7 const npy_intp* steps, void* data)
8{8{
9 npy_intp i;9 npy_intp i;
10 npy_intp n = dimensions[0];10 npy_intp n = dimensions[0];
@@ -22,8 +22,8 @@ static void aubio_PyUFunc_d_d(char **args, npy_intp *dimensions, · 11 unmodified lines
22 }22 }
23}23}
24 24
25static void aubio_PyUFunc_f_f_As_d_d(char **args, npy_intp *dimensions,25static void aubio_PyUFunc_f_f_As_d_d(char **args, const npy_intp *dimensions,
26 npy_intp* steps, void* data)26 const npy_intp* steps, void* data)
27{27{
28 npy_intp i;28 npy_intp i;
29 npy_intp n = dimensions[0];29 npy_intp n = dimensions[0];
scripts/get_waf.sh+1−1
@@ -3,7 +3,7 @@ · 2 unmodified lines
3set -e3set -e
4#set -x4#set -x
5 5
6WAFVERSION=2.0.176WAFVERSION=2.0.20
7WAFTARBALL=waf-$WAFVERSION.tar.bz27WAFTARBALL=waf-$WAFVERSION.tar.bz2
8WAFURL=https://waf.io/$WAFTARBALL8WAFURL=https://waf.io/$WAFTARBALL
9WAFUPSTREAMKEY=https://gitlab.com/ita1024/waf/raw/master/utils/pubkey.asc9WAFUPSTREAMKEY=https://gitlab.com/ita1024/waf/raw/master/utils/pubkey.asc

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t