Skip to content

Commit

Permalink
CI: unify environment creation (#24632)
Browse files Browse the repository at this point in the history
  • Loading branch information
saurav-chakravorty authored and jreback committed Apr 5, 2019
1 parent a193df1 commit b974633
Show file tree
Hide file tree
Showing 10 changed files with 141 additions and 247 deletions.
7 changes: 1 addition & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,10 @@ before_install:
install:
- echo "install start"
- ci/prep_cython_cache.sh
- ci/install_travis.sh
- ci/setup_env.sh
- ci/submit_cython_cache.sh
- echo "install done"

before_script:
- ci/install_db_travis.sh
- export DISPLAY=":99.0"
- ci/before_script_travis.sh

script:
- echo "script start"
- source activate pandas-dev
Expand Down
12 changes: 2 additions & 10 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@ jobs:
- script: |
export PATH=$HOME/miniconda3/bin:$PATH
sudo apt-get install -y libc6-dev-i386
ci/incremental/install_miniconda.sh
ci/incremental/setup_conda_environment.sh
displayName: 'Set up environment'
ci/setup_env.sh
displayName: 'Setup environment and build pandas'
condition: true
# Do not require pandas
Expand All @@ -59,13 +58,6 @@ jobs:
displayName: 'Dependencies consistency'
condition: true
- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas-dev
ci/incremental/build.sh
displayName: 'Build'
condition: true
# Require pandas
- script: |
export PATH=$HOME/miniconda3/bin:$PATH
Expand Down
14 changes: 3 additions & 11 deletions ci/azure/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,9 @@ jobs:
steps:
- script: |
if [ "$(uname)" == "Linux" ]; then sudo apt-get install -y libc6-dev-i386 $EXTRA_APT; fi
echo "Installing Miniconda"
ci/incremental/install_miniconda.sh
export PATH=$HOME/miniconda3/bin:$PATH
echo "Setting up Conda environment"
ci/incremental/setup_conda_environment.sh
displayName: 'Before Install'
- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas-dev
ci/incremental/build.sh
displayName: 'Build'
echo "Creating Environment"
ci/setup_env.sh
displayName: 'Setup environment and build pandas'
- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas-dev
Expand Down
11 changes: 0 additions & 11 deletions ci/before_script_travis.sh

This file was deleted.

16 changes: 0 additions & 16 deletions ci/incremental/build.sh

This file was deleted.

19 changes: 0 additions & 19 deletions ci/incremental/install_miniconda.sh

This file was deleted.

52 changes: 0 additions & 52 deletions ci/incremental/setup_conda_environment.sh

This file was deleted.

13 changes: 0 additions & 13 deletions ci/install_db_travis.sh

This file was deleted.

109 changes: 0 additions & 109 deletions ci/install_travis.sh

This file was deleted.

Loading

0 comments on commit b974633

Please sign in to comment.