Skip to content

Commit b974633

Browse files
saurav-chakravortyjreback
authored andcommitted
CI: unify environment creation (#24632)
1 parent a193df1 commit b974633

10 files changed

+141
-247
lines changed

.travis.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,10 @@ before_install:
8282
install:
8383
- echo "install start"
8484
- ci/prep_cython_cache.sh
85-
- ci/install_travis.sh
85+
- ci/setup_env.sh
8686
- ci/submit_cython_cache.sh
8787
- echo "install done"
8888

89-
before_script:
90-
- ci/install_db_travis.sh
91-
- export DISPLAY=":99.0"
92-
- ci/before_script_travis.sh
93-
9489
script:
9590
- echo "script start"
9691
- source activate pandas-dev

azure-pipelines.yml

+2-10
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@ jobs:
3939
- script: |
4040
export PATH=$HOME/miniconda3/bin:$PATH
4141
sudo apt-get install -y libc6-dev-i386
42-
ci/incremental/install_miniconda.sh
43-
ci/incremental/setup_conda_environment.sh
44-
displayName: 'Set up environment'
42+
ci/setup_env.sh
43+
displayName: 'Setup environment and build pandas'
4544
condition: true
4645
4746
# Do not require pandas
@@ -59,13 +58,6 @@ jobs:
5958
displayName: 'Dependencies consistency'
6059
condition: true
6160
62-
- script: |
63-
export PATH=$HOME/miniconda3/bin:$PATH
64-
source activate pandas-dev
65-
ci/incremental/build.sh
66-
displayName: 'Build'
67-
condition: true
68-
6961
# Require pandas
7062
- script: |
7163
export PATH=$HOME/miniconda3/bin:$PATH

ci/azure/posix.yml

+3-11
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,9 @@ jobs:
5050
steps:
5151
- script: |
5252
if [ "$(uname)" == "Linux" ]; then sudo apt-get install -y libc6-dev-i386 $EXTRA_APT; fi
53-
echo "Installing Miniconda"
54-
ci/incremental/install_miniconda.sh
55-
export PATH=$HOME/miniconda3/bin:$PATH
56-
echo "Setting up Conda environment"
57-
ci/incremental/setup_conda_environment.sh
58-
displayName: 'Before Install'
59-
- script: |
60-
export PATH=$HOME/miniconda3/bin:$PATH
61-
source activate pandas-dev
62-
ci/incremental/build.sh
63-
displayName: 'Build'
53+
echo "Creating Environment"
54+
ci/setup_env.sh
55+
displayName: 'Setup environment and build pandas'
6456
- script: |
6557
export PATH=$HOME/miniconda3/bin:$PATH
6658
source activate pandas-dev

ci/before_script_travis.sh

-11
This file was deleted.

ci/incremental/build.sh

-16
This file was deleted.

ci/incremental/install_miniconda.sh

-19
This file was deleted.

ci/incremental/setup_conda_environment.sh

-52
This file was deleted.

ci/install_db_travis.sh

-13
This file was deleted.

ci/install_travis.sh

-109
This file was deleted.

0 commit comments

Comments
 (0)