Skip to content
This repository was archived by the owner on Feb 2, 2024. It is now read-only.

Commit 092e9ed

Browse files
Merge pull request #357 from Vyacheslav-Smirnov/numpy_1.17
Use numpy 1.17; remove builds for numba master
2 parents d1af2d6 + 017bd00 commit 092e9ed

2 files changed

Lines changed: 20 additions & 46 deletions

File tree

.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@
22

33
dist: trusty
44

5+
branches:
6+
only:
7+
- master
8+
59
env:
610
global:
711
- GIT_DESCRIBE_TAG=0.29.2
812
- GIT_DESCRIBE_NUMBER=1
913
- PYTHON_VER=3.7
10-
- NUMPY_VER=1.16
14+
- NUMPY_VER=1.17
1115
- CONDA_PREFIX_PATH=$HOME/miniconda3
1216
matrix:
1317
- BUILD_MODE=package TEST_MODE=conda RUN_COVERAGE=False SDC_CONFIG_PIPELINE_SDC=True

azure-pipelines.yml

Lines changed: 15 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,42 @@
1+
trigger:
2+
- master
3+
4+
pr:
5+
- master
6+
17
jobs:
28
- template: buildscripts/azure/template-windows.yml
39
parameters:
4-
name: Windows2016_vs2017_Numba046
10+
name: Windows2016_vs2017
511
vmImage: vs2017-win2016
612
allowFailure: false
713
matrix:
8-
py3.7_numpy1.16:
14+
py3.7_numpy1.17:
915
PYTHON_VER: '3.7'
10-
NUMPY_VER: '1.16'
16+
NUMPY_VER: '1.17'
1117
USE_NUMBA_MASTER: 'False'
1218
SDC_CONFIG_PIPELINE_SDC: 'False'
1319

1420
- template: buildscripts/azure/template-linux-macos.yml
1521
parameters:
16-
name: macOS1013_xcode9_Numba046
22+
name: macOS1013_xcode9
1723
vmImage: xcode9-macos10.13
1824
allowFailure: false
1925
matrix:
20-
py3.7_numpy1.16:
26+
py3.7_numpy1.17:
2127
PYTHON_VER: '3.7'
22-
NUMPY_VER: '1.16'
28+
NUMPY_VER: '1.17'
2329
USE_NUMBA_MASTER: 'False'
2430
SDC_CONFIG_PIPELINE_SDC: 'False'
2531

2632
- template: buildscripts/azure/template-linux-macos.yml
2733
parameters:
28-
name: Ubuntu1604_Numba046
34+
name: Ubuntu1604
2935
vmImage: ubuntu-16.04
3036
allowFailure: false
3137
matrix:
32-
py3.7_numpy1.16:
38+
py3.7_numpy1.17:
3339
PYTHON_VER: '3.7'
34-
NUMPY_VER: '1.16'
40+
NUMPY_VER: '1.17'
3541
USE_NUMBA_MASTER: 'False'
3642
SDC_CONFIG_PIPELINE_SDC: 'False'
37-
38-
- template: buildscripts/azure/template-windows.yml
39-
parameters:
40-
name: Windows2016_vs2017_NumbaMaster
41-
vmImage: vs2017-win2016
42-
allowFailure: true
43-
matrix:
44-
py3.7_numpy1.16:
45-
PYTHON_VER: '3.7'
46-
NUMPY_VER: '1.16'
47-
USE_NUMBA_MASTER: 'True'
48-
SDC_CONFIG_PIPELINE_SDC: 'False'
49-
50-
- template: buildscripts/azure/template-linux-macos.yml
51-
parameters:
52-
name: macOS1013_xcode9_NumbaMaster
53-
vmImage: xcode9-macos10.13
54-
allowFailure: true
55-
matrix:
56-
py3.7_numpy1.16:
57-
PYTHON_VER: '3.7'
58-
NUMPY_VER: '1.16'
59-
USE_NUMBA_MASTER: 'True'
60-
SDC_CONFIG_PIPELINE_SDC: 'False'
61-
62-
- template: buildscripts/azure/template-linux-macos.yml
63-
parameters:
64-
name: Ubuntu1604_NumbaMaster
65-
vmImage: ubuntu-16.04
66-
allowFailure: true
67-
matrix:
68-
py3.7_numpy1.16:
69-
PYTHON_VER: '3.7'
70-
NUMPY_VER: '1.16'
71-
USE_NUMBA_MASTER: 'True'
72-
SDC_CONFIG_PIPELINE_SDC: 'False'

0 commit comments

Comments
 (0)