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

Commit 8c4cceb

Browse files
thomasjpfanthomasjpfan
committed
REV Revert change
1 parent 53fc978 commit 8c4cceb

File tree

2 files changed

+109
-109
lines changed

2 files changed

+109
-109
lines changed

‎azure/posix.yml

+49-49
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ jobs:
2525
${{ insert }}: ${{ parameters.matrix }}
2626

2727
steps:
28-
# - checkout: self
29-
# submodules: true
28+
- checkout: self
29+
submodules: true
3030

31-
# - task: UsePythonVersion@0
32-
# inputs:
33-
# versionSpec: $(MB_PYTHON_VERSION)
34-
# displayName: Set python version
31+
- task: UsePythonVersion@0
32+
inputs:
33+
versionSpec: $(MB_PYTHON_VERSION)
34+
displayName: Set python version
3535

3636
- bash: |
3737
set -e
@@ -55,49 +55,49 @@ jobs:
5555
echo "##vso[task.setvariable variable=TRAVIS_OS_NAME]linux"
5656
fi
5757
58-
# # Store original Python path to be able to create test_venv pointing
59-
# # to same Python version.
60-
# PYTHON_EXE=`which python`
61-
# echo "##vso[task.setvariable variable=PYTHON_EXE]$PYTHON_EXE"
62-
# displayName: Define build env variables
63-
64-
# - bash: |
65-
# set -e
66-
# pip install virtualenv
67-
# BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP"
68-
69-
# source multibuild/common_utils.sh
70-
# source multibuild/travis_steps.sh
71-
# source extra_functions.sh
72-
73-
# # Setup build dependencies
74-
# before_install
75-
76-
# # OpenMP is not present on macOS by default
77-
# setup_compiler
78-
# clean_code $REPO_DIR $BUILD_COMMIT
79-
# build_wheel $REPO_DIR $PLAT
80-
# teardown_compiler
81-
# displayName: Build wheel
82-
# condition: eq(variables['SKIP_BUILD'], 'false')
83-
84-
# - bash: |
85-
# set -xe
86-
# source multibuild/common_utils.sh
87-
# source multibuild/travis_steps.sh
88-
# source extra_functions.sh
89-
# setup_test_venv
90-
# install_run $PLAT
91-
# teardown_test_venv
92-
# displayName: Install wheel and test
93-
# condition: eq(variables['SKIP_BUILD'], 'false')
94-
95-
# - task: PublishTestResults@2
96-
# inputs:
97-
# testResultsFiles: "$(TEST_DIR)/$(JUNITXML)"
98-
# testRunTitle: ${{ format('{0}-$(Agent.JobName)', parameters.name) }}
99-
# displayName: "Publish Test Results"
100-
# condition: eq(variables['SKIP_BUILD'], 'false')
58+
# Store original Python path to be able to create test_venv pointing
59+
# to same Python version.
60+
PYTHON_EXE=`which python`
61+
echo "##vso[task.setvariable variable=PYTHON_EXE]$PYTHON_EXE"
62+
displayName: Define build env variables
63+
64+
- bash: |
65+
set -e
66+
pip install virtualenv
67+
BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP"
68+
69+
source multibuild/common_utils.sh
70+
source multibuild/travis_steps.sh
71+
source extra_functions.sh
72+
73+
# Setup build dependencies
74+
before_install
75+
76+
# OpenMP is not present on macOS by default
77+
setup_compiler
78+
clean_code $REPO_DIR $BUILD_COMMIT
79+
build_wheel $REPO_DIR $PLAT
80+
teardown_compiler
81+
displayName: Build wheel
82+
condition: eq(variables['SKIP_BUILD'], 'false')
83+
84+
- bash: |
85+
set -xe
86+
source multibuild/common_utils.sh
87+
source multibuild/travis_steps.sh
88+
source extra_functions.sh
89+
setup_test_venv
90+
install_run $PLAT
91+
teardown_test_venv
92+
displayName: Install wheel and test
93+
condition: eq(variables['SKIP_BUILD'], 'false')
94+
95+
- task: PublishTestResults@2
96+
inputs:
97+
testResultsFiles: "$(TEST_DIR)/$(JUNITXML)"
98+
testRunTitle: ${{ format('{0}-$(Agent.JobName)', parameters.name) }}
99+
displayName: "Publish Test Results"
100+
condition: eq(variables['SKIP_BUILD'], 'false')
101101

102102
- bash: |
103103
set -e

‎azure/windows.yml

+60-60
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,24 @@ jobs:
2323
matrix:
2424
${{ insert }}: ${{ parameters.matrix }}
2525
steps:
26-
# - checkout: self
27-
# submodules: true
26+
- checkout: self
27+
submodules: true
2828

29-
# - task: UsePythonVersion@0
30-
# inputs:
31-
# versionSpec: $(PYTHON_VERSION)
32-
# architecture: $(PYTHON_ARCH)
33-
# displayName: Set python version
29+
- task: UsePythonVersion@0
30+
inputs:
31+
versionSpec: $(PYTHON_VERSION)
32+
architecture: $(PYTHON_ARCH)
33+
displayName: Set python version
3434

35-
# - bash: |
36-
# set -e
35+
- bash: |
36+
set -e
3737
38-
# echo PYTHON $PYTHON_VERSION $PYTHON_ARCH
39-
# echo Build Reason: $BUILD_REASON
40-
# python --version
41-
# python -c "import struct; print(struct.calcsize('P') * 8)"
42-
# pip --version
43-
# displayName: Check that we have the expected version and architecture for Python
38+
echo PYTHON $PYTHON_VERSION $PYTHON_ARCH
39+
echo Build Reason: $BUILD_REASON
40+
python --version
41+
python -c "import struct; print(struct.calcsize('P') * 8)"
42+
pip --version
43+
displayName: Check that we have the expected version and architecture for Python
4444
4545
- bash: |
4646
set -e
@@ -62,51 +62,51 @@ jobs:
6262
echo "##vso[task.setvariable variable=PYTHON_EXE]$PYTHON_EXE"
6363
displayName: Define build env variables
6464
65-
# - bash: |
66-
# set -e
67-
# cd scikit-learn
68-
# git checkout $BUILD_COMMIT
69-
# git clean -fxd
70-
# git reset --hard
71-
# displayName: Checkout scikit-learn commit
72-
# condition: eq(variables['SKIP_BUILD'], 'false')
73-
74-
# - bash: |
75-
# set -e
76-
77-
# pip install --timeout=60 numpy==$NP_BUILD_DEP
78-
# pip install --timeout=60 pytest wheel joblib scipy==$SCIPY_BUILD_DEP Cython==$CYTHON_BUILD_DEP
79-
# pip install twine
80-
81-
# pushd scikit-learn
82-
# python setup.py build
83-
# python ../azure/vendor_vcomp140.py
84-
# python setup.py bdist_wheel
85-
# ls dist
86-
# twine check dist/*
87-
# popd
88-
# displayName: Build wheel
89-
# condition: eq(variables['SKIP_BUILD'], 'false')
90-
91-
# - bash: |
92-
# set -e
93-
# source extra_functions.sh
94-
# setup_test_venv
95-
# pip install scikit-learn/dist/scikit_learn-*.whl
96-
# mkdir $TEST_DIR
97-
# pushd $TEST_DIR
98-
# pytest -rs -l --junitxml=$JUNITXML --pyargs sklearn
99-
# popd
100-
# teardown_test_venv
101-
# displayName: Install wheel and test
102-
# condition: eq(variables['SKIP_BUILD'], 'false')
103-
104-
# - task: PublishTestResults@2
105-
# inputs:
106-
# testResultsFiles: "$(TEST_DIR)/$(JUNITXML)"
107-
# testRunTitle: ${{ format('{0}-$(Agent.JobName)', parameters.name) }}
108-
# displayName: "Publish Test Results"
109-
# condition: eq(variables['SKIP_BUILD'], 'false')
65+
- bash: |
66+
set -e
67+
cd scikit-learn
68+
git checkout $BUILD_COMMIT
69+
git clean -fxd
70+
git reset --hard
71+
displayName: Checkout scikit-learn commit
72+
condition: eq(variables['SKIP_BUILD'], 'false')
73+
74+
- bash: |
75+
set -e
76+
77+
pip install --timeout=60 numpy==$NP_BUILD_DEP
78+
pip install --timeout=60 pytest wheel joblib scipy==$SCIPY_BUILD_DEP Cython==$CYTHON_BUILD_DEP
79+
pip install twine
80+
81+
pushd scikit-learn
82+
python setup.py build
83+
python ../azure/vendor_vcomp140.py
84+
python setup.py bdist_wheel
85+
ls dist
86+
twine check dist/*
87+
popd
88+
displayName: Build wheel
89+
condition: eq(variables['SKIP_BUILD'], 'false')
90+
91+
- bash: |
92+
set -e
93+
source extra_functions.sh
94+
setup_test_venv
95+
pip install scikit-learn/dist/scikit_learn-*.whl
96+
mkdir $TEST_DIR
97+
pushd $TEST_DIR
98+
pytest -rs -l --junitxml=$JUNITXML --pyargs sklearn
99+
popd
100+
teardown_test_venv
101+
displayName: Install wheel and test
102+
condition: eq(variables['SKIP_BUILD'], 'false')
103+
104+
- task: PublishTestResults@2
105+
inputs:
106+
testResultsFiles: "$(TEST_DIR)/$(JUNITXML)"
107+
testRunTitle: ${{ format('{0}-$(Agent.JobName)', parameters.name) }}
108+
displayName: "Publish Test Results"
109+
condition: eq(variables['SKIP_BUILD'], 'false')
110110

111111
- bash: |
112112
set -e

0 commit comments

Comments
 (0)