Skip to content

CI: unify environment creation #24632

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.

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 29 commits into from
Apr 5, 2019
Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
04b9abb
CI: unify environment creation
saurav-chakravorty Jan 5, 2019
4ae7b16
Merge remote-tracking branch 'upstream/master' into CI
saurav-chakravorty Jan 5, 2019
2b2b565
Change permissions
saurav-chakravorty Jan 5, 2019
e9a8442
removed pip cmd
saurav-chakravorty Jan 5, 2019
a8d22f3
removed wrong exit 0
saurav-chakravorty Jan 5, 2019
730ab53
remove hash-bang
saurav-chakravorty Jan 5, 2019
c5d357f
Merge branch 'master' into CI
saurav-chakravorty Jan 5, 2019
abaf652
further cleanup
saurav-chakravorty Jan 6, 2019
14d164a
removed space aroung var
saurav-chakravorty Jan 6, 2019
6d469db
minor typo
saurav-chakravorty Jan 6, 2019
8d34048
Changing build files for Azure
saurav-chakravorty Jan 6, 2019
6b22414
corrected file name
saurav-chakravorty Jan 6, 2019
625ddce
upper case variables and some cleanup.
saurav-chakravorty Jan 7, 2019
e68b1e2
add export path
saurav-chakravorty Jan 7, 2019
39e3365
remove debugging echo
saurav-chakravorty Jan 7, 2019
595815a
bug in install DB
saurav-chakravorty Jan 7, 2019
ae538e5
Correct spelling of Linux
saurav-chakravorty Jan 7, 2019
784244a
Only Travis has DBs
saurav-chakravorty Jan 7, 2019
6d333ab
Merge remote-tracking branch 'upstream/master' into CI
saurav-chakravorty Jan 7, 2019
7016f52
more cleanups
saurav-chakravorty Jan 7, 2019
583b42d
fixing typo
saurav-chakravorty Jan 8, 2019
d3e9530
make dbs travis-linux only
saurav-chakravorty Jan 8, 2019
f6ea4c2
error on xvfb
saurav-chakravorty Jan 8, 2019
4cbc587
more cleanups
saurav-chakravorty Jan 8, 2019
54cca4d
Merge remote-tracking branch 'upstream/master' into CI
saurav-chakravorty Feb 17, 2019
e66a69c
Merge remote-tracking branch 'upstream/master' into CI
saurav-chakravorty Feb 17, 2019
b9cedb1
Merge remote-tracking branch 'upstream/master' into CI
saurav-chakravorty Feb 18, 2019
549a297
Merge remote-tracking branch 'upstream/master' into CI
saurav-chakravorty Mar 1, 2019
e400387
Merge remote-tracking branch 'upstream/master' into CI
saurav-chakravorty Mar 31, 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
7 changes: 1 addition & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,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 @@ -40,9 +40,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 @@ -60,13 +59,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