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

Commit e7851df

Browse files
committed
Merge remote-tracking branch 'vsm/switch_tests_to_new_pipeline' into skip-test-new-style-master
2 parents c5004bc + f2d2918 commit e7851df

4 files changed

Lines changed: 12 additions & 5 deletions

File tree

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ env:
1010
- NUMPY_VER=1.16
1111
- CONDA_PREFIX_PATH=$HOME/miniconda3
1212
matrix:
13-
- BUILD_MODE=package TEST_MODE=conda RUN_COVERAGE=False SDC_NP_MPI=1
14-
- BUILD_MODE=develop TEST_MODE=develop RUN_COVERAGE=True
13+
- BUILD_MODE=package TEST_MODE=conda RUN_COVERAGE=False SDC_CONFIG_PIPELINE_SDC=True
14+
- BUILD_MODE=package TEST_MODE=conda RUN_COVERAGE=False SDC_CONFIG_PIPELINE_SDC=True SDC_NP_MPI=1
15+
- BUILD_MODE=develop TEST_MODE=develop RUN_COVERAGE=True SDC_CONFIG_PIPELINE_SDC=True
1516

1617
before_install:
1718
- chmod 777 buildscripts/install_conda.sh

azure-pipelines.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99
PYTHON_VER: '3.7'
1010
NUMPY_VER: '1.16'
1111
USE_NUMBA_MASTER: 'False'
12+
SDC_CONFIG_PIPELINE_SDC: 'False'
1213

1314
- template: buildscripts/azure/template-linux-macos.yml
1415
parameters:
@@ -20,6 +21,7 @@ jobs:
2021
PYTHON_VER: '3.7'
2122
NUMPY_VER: '1.16'
2223
USE_NUMBA_MASTER: 'False'
24+
SDC_CONFIG_PIPELINE_SDC: 'False'
2325

2426
- template: buildscripts/azure/template-linux-macos.yml
2527
parameters:
@@ -31,6 +33,7 @@ jobs:
3133
PYTHON_VER: '3.7'
3234
NUMPY_VER: '1.16'
3335
USE_NUMBA_MASTER: 'False'
36+
SDC_CONFIG_PIPELINE_SDC: 'False'
3437

3538
- template: buildscripts/azure/template-windows.yml
3639
parameters:
@@ -42,6 +45,7 @@ jobs:
4245
PYTHON_VER: '3.7'
4346
NUMPY_VER: '1.16'
4447
USE_NUMBA_MASTER: 'True'
48+
SDC_CONFIG_PIPELINE_SDC: 'False'
4549

4650
- template: buildscripts/azure/template-linux-macos.yml
4751
parameters:
@@ -53,6 +57,7 @@ jobs:
5357
PYTHON_VER: '3.7'
5458
NUMPY_VER: '1.16'
5559
USE_NUMBA_MASTER: 'True'
60+
SDC_CONFIG_PIPELINE_SDC: 'False'
5661

5762
- template: buildscripts/azure/template-linux-macos.yml
5863
parameters:
@@ -63,4 +68,5 @@ jobs:
6368
py3.7_numpy1.16:
6469
PYTHON_VER: '3.7'
6570
NUMPY_VER: '1.16'
66-
USE_NUMBA_MASTER: 'True'
71+
USE_NUMBA_MASTER: 'True'
72+
SDC_CONFIG_PIPELINE_SDC: 'False'

buildscripts/azure/template-linux-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
2323
- script: |
2424
if [ "$USE_NUMBA_MASTER" == "False" ]; then
25-
$HOME/miniconda3/bin/python buildscripts/build.py --build-mode=package --python=$PYTHON_VER --numpy=$NUMPY_VER --conda-prefix=$HOME/miniconda3;
25+
$HOME/miniconda3/bin/python buildscripts/build.py --build-mode=package --python=$PYTHON_VER --numpy=$NUMPY_VER --skip-smoke-tests --conda-prefix=$HOME/miniconda3;
2626
else
2727
$HOME/miniconda3/bin/python buildscripts/build.py --build-mode=package --python=$PYTHON_VER --numpy=$NUMPY_VER --use-numba-master --conda-prefix=$HOME/miniconda3;
2828
fi

buildscripts/azure/template-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
- script: |
2323
IF "%USE_NUMBA_MASTER%" == "False" (
24-
"C:\\Miniconda\\python.exe" buildscripts\\build.py --build-mode=package --python=%PYTHON_VER% --numpy=%NUMPY_VER% --conda-prefix="C:\\Miniconda"
24+
"C:\\Miniconda\\python.exe" buildscripts\\build.py --build-mode=package --python=%PYTHON_VER% --numpy=%NUMPY_VER% --skip-smoke-tests --conda-prefix="C:\\Miniconda"
2525
) ELSE (
2626
"C:\\Miniconda\\python.exe" buildscripts\\build.py --build-mode=package --python=%PYTHON_VER% --numpy=%NUMPY_VER% --use-numba-master --conda-prefix="C:\\Miniconda")
2727
displayName: 'Build conda and wheel packages'

0 commit comments

Comments
 (0)