Skip to content

Commit 820e09e

Browse files
bhavaniravidatapythonista
authored andcommitted
CI: Fix setting PATH in azure pipelines (#27787)
1 parent a45760f commit 820e09e

File tree

3 files changed

+9
-25
lines changed

3 files changed

+9
-25
lines changed

azure-pipelines.yml

+4-18
Original file line numberDiff line numberDiff line change
@@ -22,80 +22,67 @@ jobs:
2222
timeoutInMinutes: 90
2323
steps:
2424
- script: |
25-
# XXX next command should avoid redefining the path in every step, but
26-
# made the process crash as it couldn't find deactivate
27-
#echo '##vso[task.prependpath]$HOME/miniconda3/bin'
25+
echo '##vso[task.prependpath]$(HOME)/miniconda3/bin'
2826
echo '##vso[task.setvariable variable=ENV_FILE]environment.yml'
2927
echo '##vso[task.setvariable variable=AZURE]true'
3028
displayName: 'Setting environment variables'
3129
3230
# Do not require a conda environment
33-
- script: |
34-
export PATH=$HOME/miniconda3/bin:$PATH
35-
ci/code_checks.sh patterns
31+
- script: ci/code_checks.sh patterns
3632
displayName: 'Looking for unwanted patterns'
3733
condition: true
3834

3935
- script: |
40-
export PATH=$HOME/miniconda3/bin:$PATH
4136
sudo apt-get install -y libc6-dev-i386
4237
ci/setup_env.sh
4338
displayName: 'Setup environment and build pandas'
4439
condition: true
4540
4641
# Do not require pandas
4742
- script: |
48-
export PATH=$HOME/miniconda3/bin:$PATH
4943
source activate pandas-dev
5044
ci/code_checks.sh lint
5145
displayName: 'Linting'
5246
condition: true
5347
5448
- script: |
55-
export PATH=$HOME/miniconda3/bin:$PATH
5649
source activate pandas-dev
5750
ci/code_checks.sh dependencies
5851
displayName: 'Dependencies consistency'
5952
condition: true
6053
6154
# Require pandas
6255
- script: |
63-
export PATH=$HOME/miniconda3/bin:$PATH
6456
source activate pandas-dev
6557
ci/code_checks.sh code
6658
displayName: 'Checks on imported code'
6759
condition: true
6860
6961
- script: |
70-
export PATH=$HOME/miniconda3/bin:$PATH
7162
source activate pandas-dev
7263
ci/code_checks.sh doctests
7364
displayName: 'Running doctests'
7465
condition: true
7566
7667
- script: |
77-
export PATH=$HOME/miniconda3/bin:$PATH
7868
source activate pandas-dev
7969
ci/code_checks.sh docstrings
8070
displayName: 'Docstring validation'
8171
condition: true
8272
8373
- script: |
84-
export PATH=$HOME/miniconda3/bin:$PATH
8574
source activate pandas-dev
8675
ci/code_checks.sh typing
8776
displayName: 'Typing validation'
8877
condition: true
8978
9079
- script: |
91-
export PATH=$HOME/miniconda3/bin:$PATH
9280
source activate pandas-dev
9381
pytest --capture=no --strict scripts
94-
displayName: 'Testing docstring validaton script'
82+
displayName: 'Testing docstring validation script'
9583
condition: true
9684
9785
- script: |
98-
export PATH=$HOME/miniconda3/bin:$PATH
9986
source activate pandas-dev
10087
cd asv_bench
10188
asv check -E existing
@@ -124,16 +111,15 @@ jobs:
124111
steps:
125112
- script: |
126113
echo '##vso[task.setvariable variable=ENV_FILE]environment.yml'
114+
echo '##vso[task.prependpath]$(HOME)/miniconda3/bin'
127115
displayName: 'Setting environment variables'
128116
129117
- script: |
130-
export PATH=$HOME/miniconda3/bin:$PATH
131118
sudo apt-get install -y libc6-dev-i386
132119
ci/setup_env.sh
133120
displayName: 'Setup environment and build pandas'
134121
135122
- script: |
136-
export PATH=$HOME/miniconda3/bin:$PATH
137123
source activate pandas-dev
138124
# Next we should simply have `doc/make.py --warnings-are-errors`, everything else is required because the ipython directive doesn't fail the build on errors (https://github.com/ipython/ipython/issues/11547)
139125
doc/make.py --warnings-are-errors | tee sphinx.log ; SPHINX_RET=${PIPESTATUS[0]}

ci/azure/posix.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,15 @@ jobs:
5656
steps:
5757
- script: |
5858
if [ "$(uname)" == "Linux" ]; then sudo apt-get install -y libc6-dev-i386 $EXTRA_APT; fi
59+
echo '##vso[task.prependpath]$(HOME)/miniconda3/bin'
5960
echo "Creating Environment"
6061
ci/setup_env.sh
6162
displayName: 'Setup environment and build pandas'
6263
- script: |
63-
export PATH=$HOME/miniconda3/bin:$PATH
6464
source activate pandas-dev
6565
ci/run_tests.sh
6666
displayName: 'Test'
67-
- script: |
68-
export PATH=$HOME/miniconda3/bin:$PATH
69-
source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
67+
- script: source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
7068
- task: PublishTestResults@2
7169
inputs:
7270
testResultsFiles: 'test-data-*.xml'
@@ -97,7 +95,6 @@ jobs:
9795
}
9896
displayName: 'Check for test failures'
9997
- script: |
100-
export PATH=$HOME/miniconda3/bin:$PATH
10198
source activate pandas-dev
10299
python ci/print_skipped.py
103100
displayName: 'Print skipped tests'

ci/azure/windows.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ jobs:
1717
CONDA_PY: "37"
1818

1919
steps:
20-
- powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
20+
- powershell: |
21+
Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
22+
Write-Host "##vso[task.prependpath]$HOME/miniconda3/bin"
2123
displayName: 'Add conda to PATH'
2224
- script: conda update -q -n base conda
2325
displayName: Update conda
@@ -52,7 +54,6 @@ jobs:
5254
}
5355
displayName: 'Check for test failures'
5456
- script: |
55-
export PATH=$HOME/miniconda3/bin:$PATH
5657
source activate pandas-dev
5758
python ci/print_skipped.py
5859
displayName: 'Print skipped tests'

0 commit comments

Comments
 (0)