Skip to content

Fix miniconda path issue #26962 #27787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Aug 7, 2019
Merged

Fix miniconda path issue #26962 #27787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0cadca3
resetting path in azure-pipeline.md
bhavaniravi Aug 3, 2019
24529a1
resetting path in azure-pipeline.md
bhavaniravi Aug 3, 2019
caaa6e6
Merge branch 'fix/miniconda_path' of github.com:bhavaniravi/pandas in…
bhavaniravi Aug 3, 2019
f016ba8
Merge branch 'fix/miniconda_path' of github.com:bhavaniravi/pandas in…
bhavaniravi Aug 3, 2019
e1fcfbd
Merge branch 'fix/miniconda_path' of github.com:bhavaniravi/pandas in…
bhavaniravi Aug 3, 2019
6b81d28
Merge branch 'fix/miniconda_path' of github.com:bhavaniravi/pandas in…
bhavaniravi Aug 3, 2019
672dc3d
Merge branch 'fix/miniconda_path' of github.com:bhavaniravi/pandas in…
bhavaniravi Aug 3, 2019
cf24d9d
Merge branch 'fix/miniconda_path' of github.com:bhavaniravi/pandas in…
bhavaniravi Aug 3, 2019
9f4cc3b
Merge branch 'fix/miniconda_path' of github.com:bhavaniravi/pandas in…
bhavaniravi Aug 3, 2019
df98bae
Merge branch 'fix/miniconda_path' of github.com:bhavaniravi/pandas in…
bhavaniravi Aug 3, 2019
66fe488
Merge branch 'fix/miniconda_path' of github.com:bhavaniravi/pandas in…
bhavaniravi Aug 4, 2019
366df33
add miniconda path to docs
bhavaniravi Aug 4, 2019
3e9405e
fix syntax error in posix
bhavaniravi Aug 4, 2019
b2bdd84
fix posix block error
bhavaniravi Aug 4, 2019
95f8b58
fix missing braces around HOME
bhavaniravi Aug 4, 2019
e6ca881
reorder path setting in posix
bhavaniravi Aug 6, 2019
4969422
reorder path setting in posix
bhavaniravi Aug 6, 2019
5691d8f
undo doc generation
bhavaniravi Aug 6, 2019
6e7f022
remove unwanted echo in setup_env
bhavaniravi Aug 6, 2019
2cbc3c4
remove unwanted echo
bhavaniravi Aug 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 4 additions & 18 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,80 +22,67 @@ jobs:
timeoutInMinutes: 90
steps:
- script: |
# XXX next command should avoid redefining the path in every step, but
# made the process crash as it couldn't find deactivate
#echo '##vso[task.prependpath]$HOME/miniconda3/bin'
echo '##vso[task.prependpath]$(HOME)/miniconda3/bin'
echo '##vso[task.setvariable variable=ENV_FILE]environment.yml'
echo '##vso[task.setvariable variable=AZURE]true'
displayName: 'Setting environment variables'

# Do not require a conda environment
- script: |
export PATH=$HOME/miniconda3/bin:$PATH
ci/code_checks.sh patterns
- script: ci/code_checks.sh patterns
displayName: 'Looking for unwanted patterns'
condition: true

- script: |
export PATH=$HOME/miniconda3/bin:$PATH
sudo apt-get install -y libc6-dev-i386
ci/setup_env.sh
displayName: 'Setup environment and build pandas'
condition: true

# Do not require pandas
- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas-dev
ci/code_checks.sh lint
displayName: 'Linting'
condition: true

- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas-dev
ci/code_checks.sh dependencies
displayName: 'Dependencies consistency'
condition: true

# Require pandas
- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas-dev
ci/code_checks.sh code
displayName: 'Checks on imported code'
condition: true

- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas-dev
ci/code_checks.sh doctests
displayName: 'Running doctests'
condition: true

- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas-dev
ci/code_checks.sh docstrings
displayName: 'Docstring validation'
condition: true

- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas-dev
ci/code_checks.sh typing
displayName: 'Typing validation'
condition: true

- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas-dev
pytest --capture=no --strict scripts
displayName: 'Testing docstring validaton script'
displayName: 'Testing docstring validation script'
condition: true

- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas-dev
cd asv_bench
asv check -E existing
Expand Down Expand Up @@ -124,16 +111,15 @@ jobs:
steps:
- script: |
echo '##vso[task.setvariable variable=ENV_FILE]environment.yml'
echo '##vso[task.prependpath]$(HOME)/miniconda3/bin'
displayName: 'Setting environment variables'

- script: |
export PATH=$HOME/miniconda3/bin:$PATH
sudo apt-get install -y libc6-dev-i386
ci/setup_env.sh
displayName: 'Setup environment and build pandas'

- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas-dev
# 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)
doc/make.py --warnings-are-errors | tee sphinx.log ; SPHINX_RET=${PIPESTATUS[0]}
Expand Down
7 changes: 2 additions & 5 deletions ci/azure/posix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,15 @@ jobs:
steps:
- script: |
if [ "$(uname)" == "Linux" ]; then sudo apt-get install -y libc6-dev-i386 $EXTRA_APT; fi
echo '##vso[task.prependpath]$(HOME)/miniconda3/bin'
echo "Creating Environment"
ci/setup_env.sh
displayName: 'Setup environment and build pandas'
- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas-dev
ci/run_tests.sh
displayName: 'Test'
- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
- script: source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
- task: PublishTestResults@2
inputs:
testResultsFiles: 'test-data-*.xml'
Expand Down Expand Up @@ -97,7 +95,6 @@ jobs:
}
displayName: 'Check for test failures'
- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas-dev
python ci/print_skipped.py
displayName: 'Print skipped tests'
5 changes: 3 additions & 2 deletions ci/azure/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ jobs:
CONDA_PY: "37"

steps:
- powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
- powershell: |
Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
Write-Host "##vso[task.prependpath]$HOME/miniconda3/bin"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bhavaniravi any idea if there is a way to do this without powershell? now that windows supports bash, im trying to see if we can get rid of windows-specific stuff

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In bash this is a simple echo I think.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thats what I thought too, see #30393 where I tried that in the first commit and reverted it when that failed

displayName: 'Add conda to PATH'
- script: conda update -q -n base conda
displayName: Update conda
Expand Down Expand Up @@ -52,7 +54,6 @@ jobs:
}
displayName: 'Check for test failures'
- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas-dev
python ci/print_skipped.py
displayName: 'Print skipped tests'