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
1515 PYTHON_VERSION: 2.7.x
1616 PYTHON_ARCH: 64
1717
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−
2618 - PYTHONDIR: C:\Python36
2719 PYTHON_VERSION: 3.6.x
2820 PYTHON_ARCH: 32
@@ -39,6 +31,14 @@ environment: · 10 unmodified lines
3931 PYTHON_VERSION: 3.7.x
4032 PYTHON_ARCH: 64
4133
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+
4242 install:
4343 - ECHO "Installed SDKs:"
4444 - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\""
.circleci/config.yml+6−6
@@ -66,9 +66,9 @@ jobs: · 65 unmodified lines
6666 - store_artifacts:
6767 path: dist/
6868
69− build-37:
69+ build-latest:
7070 docker:
71− - image: circleci/python:3.7
71+ - image: circleci/python:latest
7272 steps:
7373 - checkout
7474 - run: *apt-install
@@ -80,9 +80,9 @@ jobs: · 5 unmodified lines
8080 - store_artifacts:
8181 path: dist/
8282
83− build-37-nodeps:
83+ build-latest-nodeps:
8484 docker:
85− - image: circleci/python:3.7
85+ - image: circleci/python:latest
8686 steps:
8787 - checkout
8888 - run: *pip-install
@@ -100,5 +100,5 @@ workflows: · 11 unmodified lines
100100 jobs:
101101 - build-27
102102 - build-36
103− - build-37
104− - build-37-nodeps
103+ - build-latest
104+ - build-latest-nodeps
.travis.yml+41−45
@@ -2,55 +2,62 @@ language: python · 1 unmodified line
22
33 matrix:
44 include:
5− - python: 3.6
5+ - name: "Linux (Python 3.8)"
6+ python: 3.8
67 os: linux
7− compiler: gcc
8− - python: 3.5
8+ distro: bionic
9+ - name: "Linux (Python 3.6)"
10+ python: 3.6
911 os: linux
10− compiler: gcc
1112 env: WAFOPTS="--build-type=debug"
12− - python: 2.7
13+ - name: "Linux (Python 2.7)"
14+ python: 2.7
1315 os: linux
14− compiler: gcc
15− - python: "pypy3.5"
16+ distro: trusty
17+ - name: "Linux (Python pypy3.5)"
18+ language: python
19+ python: "pypy3.5"
1620 os: linux
17− compiler: gcc
18− env: CFLAGS="-Os" WAFOPTS="--disable-avcodec"
19− - python: 3.6
21+ - name: "Linux (fftw3, no other deps)"
22+ python: 3.8
2023 os: linux
21− compiler: gcc
22− env: CFLAGS="-Os" WAFOPTS="--disable-samplerate"
23− - python: 3.5
24+ env: HAVE_AUBIO_DOUBLE=1 CFLAGS="-O3" WAFOPTS="--enable-fftw3 --disable-avcodec --disable-samplerate"
25+ - name: "Linux (default, dpkg-buildflags)"
2426 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
3027 env: CFLAGS="`dpkg-buildflags --get CFLAGS`" LDFLAGS="`dpkg-buildflags --get LDFLAGS`"
31− - language: C
28+
29+ - name: "macOS (xcode11)"
30+ language: shell
3231 os: osx
33− compiler: clang
34− - language: C
32+ osx_image: xcode11
33+ - name: "macOS (xcode12, lib only)"
34+ language: shell
3535 os: osx
36− compiler: clang
37− env: CFLAGS="-Os" HAVE_AUBIO_DOUBLE=1 WAFOPTS="--disable-accelerate"
38− - language: C
36+ osx_image: xcode12
37+ script:
38+ - make test_lib_only_clean
39+ - name: "macOS (xcode10, noopt, nodeps)"
40+ language: shell
3941 os: osx
40− compiler: clang
41− env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband"
42− - language: C
42+ osx_image: xcode10
43+ env: CFLAGS="-Os" HAVE_AUBIO_DOUBLE=1 WAFOPTS="--disable-accelerate --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband"
44+ - name: "iOS"
45+ language: shell
4346 os: osx
44− compiler: clang
4547 env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband" AUBIO_NOTESTS=1
46− - language: C
48+ - name: "iOSSimulator"
49+ language: shell
4750 os: osx
48− compiler: clang
4951 env: WAFOPTS="--with-target-platform=iosimulator --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband" AUBIO_NOTESTS=1
5052
51−# use trusty
52−dist: trusty
53−sudo: required
53+# - name: "Windows (Python 3.8.0, lib only)"
54+# language: shell
55+# 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
5461
5562 addons:
5663 apt:
@@ -78,19 +85,8 @@ addons: · 21 unmodified lines
7885 - lcov
7986 update: true
8087
81−before_install:
82− - |
83− if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
84− export PATH="$HOME/Library/Python/2.7/bin/:$PATH"
85− fi;
86−
8788 install:
88− - |
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
89+ - make getwaf deps_python
9490 - which pip
9591 - pip --version
9692 - pip install coverage
python/ext/ufuncs.c+4−4
@@ -3,8 +3,8 @@ · 2 unmodified lines
33
44 typedef smpl_t (*aubio_unary_func_t)(smpl_t input);
55
6−static void aubio_PyUFunc_d_d(char **args, npy_intp *dimensions,
7− npy_intp* steps, void* data)
6+static void aubio_PyUFunc_d_d(char **args, const npy_intp *dimensions,
7+ const npy_intp* steps, void* data)
88 {
99 npy_intp i;
1010 npy_intp n = dimensions[0];
@@ -22,8 +22,8 @@ static void aubio_PyUFunc_d_d(char **args, npy_intp *dimensions, · 11 unmodified lines
2222 }
2323 }
2424
25−static void aubio_PyUFunc_f_f_As_d_d(char **args, npy_intp *dimensions,
26− npy_intp* steps, void* data)
25+static void aubio_PyUFunc_f_f_As_d_d(char **args, const npy_intp *dimensions,
26+ const npy_intp* steps, void* data)
2727 {
2828 npy_intp i;
2929 npy_intp n = dimensions[0];
scripts/get_waf.sh+1−1
@@ -3,7 +3,7 @@ · 2 unmodified lines
33 set -e
44 #set -x
55
6−WAFVERSION=2.0.17
6+WAFVERSION=2.0.20
77 WAFTARBALL=waf-$WAFVERSION.tar.bz2
88 WAFURL=https://waf.io/$WAFTARBALL
99 WAFUPSTREAMKEY=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