Skip to content

Commit 002ab43

Browse files
charlesdong1991jreback
authored andcommitted
CI: Fixes to conda environment names (#23866)
1 parent 3117f78 commit 002ab43

33 files changed

+47
-68
lines changed

.circleci/config.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,13 @@ jobs:
2626
name: build
2727
command: |
2828
./ci/circle/install_circle.sh
29-
./ci/circle/show_circle.sh
29+
export PATH="$MINICONDA_DIR/bin:$PATH"
30+
source activate pandas-dev
31+
python -c "import pandas; pandas.show_versions();"
3032
- run:
3133
name: test
32-
command: ./ci/circle/run_circle.sh --skip-slow --skip-network
34+
command: |
35+
export PATH="$MINICONDA_DIR/bin:$PATH"
36+
source activate pandas-dev
37+
echo "pytest --strict --durations=10 --color=no --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml --skip-slow --skip-network pandas"
38+
pytest --strict --durations=10 --color=no --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml --skip-slow --skip-network pandas

.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ before_script:
105105

106106
script:
107107
- echo "script start"
108+
- source activate pandas-dev
108109
- ci/run_build_docs.sh
109110
- ci/script_single.sh
110111
- ci/script_multi.sh
@@ -115,7 +116,7 @@ after_success:
115116

116117
after_script:
117118
- echo "after_script start"
118-
- source activate pandas && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
119+
- source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
119120
- if [ -e test-data-single.xml ]; then
120121
ci/print_skipped.py test-data-single.xml;
121122
fi

ci/azure/linux.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,17 @@ jobs:
1212
py27_np_19:
1313
ENV_FILE: ci/deps/azure-27-compat.yaml
1414
CONDA_PY: "27"
15-
CONDA_ENV: pandas
1615
TEST_ARGS: "--skip-slow --skip-network"
1716

1817
py37_locale:
1918
ENV_FILE: ci/deps/azure-37-locale.yaml
2019
CONDA_PY: "37"
21-
CONDA_ENV: pandas
2220
TEST_ARGS: "--skip-slow --skip-network"
2321
LOCALE_OVERRIDE: "zh_CN.UTF-8"
2422

2523
py36_locale_slow:
2624
ENV_FILE: ci/deps/azure-36-locale_slow.yaml
2725
CONDA_PY: "36"
28-
CONDA_ENV: pandas
2926
TEST_ARGS: "--only-slow --skip-network"
3027
LOCALE_OVERRIDE: "it_IT.UTF-8"
3128

@@ -40,17 +37,19 @@ jobs:
4037
displayName: 'Before Install'
4138
- script: |
4239
export PATH=$HOME/miniconda3/bin:$PATH
40+
source activate pandas-dev
4341
ci/incremental/build.sh
4442
displayName: 'Build'
4543
- script: |
4644
export PATH=$HOME/miniconda3/bin:$PATH
45+
source activate pandas-dev
4746
ci/script_single.sh
4847
ci/script_multi.sh
4948
echo "[Test done]"
5049
displayName: 'Test'
5150
- script: |
5251
export PATH=$HOME/miniconda3/bin:$PATH
53-
source activate pandas && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
52+
source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
5453
- task: PublishTestResults@2
5554
inputs:
5655
testResultsFiles: 'test-data-*.xml'

ci/azure/macos.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ jobs:
1212
py35_np_120:
1313
ENV_FILE: ci/deps/azure-macos-35.yaml
1414
CONDA_PY: "35"
15-
CONDA_ENV: pandas
1615
TEST_ARGS: "--skip-slow --skip-network"
1716

1817
steps:
@@ -26,17 +25,19 @@ jobs:
2625
displayName: 'Before Install'
2726
- script: |
2827
export PATH=$HOME/miniconda3/bin:$PATH
28+
source activate pandas-dev
2929
ci/incremental/build.sh
3030
displayName: 'Build'
3131
- script: |
3232
export PATH=$HOME/miniconda3/bin:$PATH
33+
source activate pandas-dev
3334
ci/script_single.sh
3435
ci/script_multi.sh
3536
echo "[Test done]"
3637
displayName: 'Test'
3738
- script: |
3839
export PATH=$HOME/miniconda3/bin:$PATH
39-
source activate pandas && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
40+
source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
4041
- task: PublishTestResults@2
4142
inputs:
4243
testResultsFiles: 'test-data-*.xml'
@@ -65,4 +66,4 @@ jobs:
6566
# note that this will produce $LASTEXITCODE=1
6667
Write-Error "$($matches[1]) tests failed"
6768
}
68-
displayName: Check for test failures
69+
displayName: Check for test failures

ci/azure/windows-py27.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ jobs:
1212
py36_np121:
1313
ENV_FILE: ci/deps/azure-windows-27.yaml
1414
CONDA_PY: "27"
15-
CONDA_ENV: pandas
1615

1716
steps:
1817
- task: CondaEnvironment@1
@@ -33,10 +32,11 @@ jobs:
3332
ci\\incremental\\setup_conda_environment.cmd
3433
displayName: 'Before Install'
3534
- script: |
35+
call activate pandas-dev
3636
ci\\incremental\\build.cmd
3737
displayName: 'Build'
3838
- script: |
39-
call activate %CONDA_ENV%
39+
call activate pandas-dev
4040
pytest --junitxml=test-data.xml --skip-slow --skip-network pandas -n 2 -r sxX --strict --durations=10 %*
4141
displayName: 'Test'
4242
- task: PublishTestResults@2

ci/azure/windows.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ jobs:
1212
py36_np14:
1313
ENV_FILE: ci/deps/azure-windows-36.yaml
1414
CONDA_PY: "36"
15-
CONDA_ENV: pandas
1615

1716
steps:
1817
- task: CondaEnvironment@1
@@ -24,10 +23,11 @@ jobs:
2423
ci\\incremental\\setup_conda_environment.cmd
2524
displayName: 'Before Install'
2625
- script: |
26+
call activate pandas-dev
2727
ci\\incremental\\build.cmd
2828
displayName: 'Build'
2929
- script: |
30-
call activate %CONDA_ENV%
30+
call activate pandas-dev
3131
pytest --junitxml=test-data.xml --skip-slow --skip-network pandas -n 2 -r sxX --strict --durations=10 %*
3232
displayName: 'Test'
3333
- task: PublishTestResults@2
@@ -46,4 +46,4 @@ jobs:
4646
# note that this will produce $LASTEXITCODE=1
4747
Write-Error "$($matches[1]) tests failed"
4848
}
49-
displayName: Check for test failures
49+
displayName: Check for test failures

ci/build_docs.sh

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ if [ "$DOC" ]; then
1212

1313
echo "Will build docs"
1414

15-
source activate pandas
16-
1715
echo ###############################
1816
echo # Log file for the doc build #
1917
echo ###############################

ci/circle/install_circle.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ fi
6060

6161
# create envbuild deps
6262
echo "[create env]"
63-
time conda env create -q -n pandas --file="${ENV_FILE}" || exit 1
63+
time conda env create -q --file="${ENV_FILE}" || exit 1
6464

65-
source activate pandas
65+
source activate pandas-dev
6666

6767
# remove any installed pandas package
6868
# w/o removing anything else

ci/circle/run_circle.sh

-9
This file was deleted.

ci/circle/show_circle.sh

-8
This file was deleted.

ci/code_checks.sh

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ echo "inside $0"
2020
[[ -z "$1" || "$1" == "lint" || "$1" == "patterns" || "$1" == "doctests" || "$1" == "dependencies" ]] \
2121
|| { echo "Unknown command $1. Usage: $0 [lint|patterns|doctests|dependencies]"; exit 9999; }
2222

23-
source activate pandas
2423
BASE_DIR="$(dirname $0)/.."
2524
RET=0
2625
CHECK=$1

ci/deps/azure-27-compat.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: pandas
1+
name: pandas-dev
22
channels:
33
- defaults
44
- conda-forge

ci/deps/azure-36-locale_slow.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: pandas
1+
name: pandas-dev
22
channels:
33
- defaults
44
- conda-forge

ci/deps/azure-37-locale.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: pandas
1+
name: pandas-dev
22
channels:
33
- defaults
44
- conda-forge

ci/deps/azure-macos-35.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: pandas
1+
name: pandas-dev
22
channels:
33
- defaults
44
dependencies:

ci/deps/azure-windows-27.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: pandas
1+
name: pandas-dev
22
channels:
33
- defaults
44
- conda-forge

ci/deps/azure-windows-36.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: pandas
1+
name: pandas-dev
22
channels:
33
- defaults
44
- conda-forge

ci/deps/circle-36-locale.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: pandas
1+
name: pandas-dev
22
channels:
33
- defaults
44
- conda-forge

ci/deps/travis-27-locale.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: pandas
1+
name: pandas-dev
22
channels:
33
- defaults
44
- conda-forge

ci/deps/travis-27.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: pandas
1+
name: pandas-dev
22
channels:
33
- defaults
44
- conda-forge

ci/deps/travis-36-doc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: pandas
1+
name: pandas-dev
22
channels:
33
- defaults
44
- conda-forge

ci/deps/travis-36-slow.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: pandas
1+
name: pandas-dev
22
channels:
33
- defaults
44
- conda-forge

ci/deps/travis-36.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: pandas
1+
name: pandas-dev
22
channels:
33
- defaults
44
- conda-forge

ci/deps/travis-37-numpydev.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: pandas
1+
name: pandas-dev
22
channels:
33
- defaults
44
dependencies:

ci/deps/travis-37.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: pandas
1+
name: pandas-dev
22
channels:
33
- defaults
44
- conda-forge

ci/incremental/build.cmd

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@rem https://github.com/numba/numba/blob/master/buildscripts/incremental/build.cmd
2-
call activate %CONDA_ENV%
32

43
@rem Build numba extensions without silencing compile errors
54
python setup.py build_ext -q --inplace

ci/incremental/build.sh

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#!/bin/bash
22

3-
source activate $CONDA_ENV
4-
53
# Make sure any error below is reported as such
64
set -v -e
75

ci/incremental/setup_conda_environment.cmd

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ call deactivate
1111
@rem Display root environment (for debugging)
1212
conda list
1313
@rem Clean up any left-over from a previous build
14-
conda remove --all -q -y -n %CONDA_ENV%
14+
conda remove --all -q -y -n pandas-dev
1515
@rem Scipy, CFFI, jinja2 and IPython are optional dependencies, but exercised in the test suite
16-
conda env create -n %CONDA_ENV% --file=ci\deps\azure-windows-%CONDA_PY%.yaml
16+
conda env create --file=ci\deps\azure-windows-%CONDA_PY%.yaml
1717

18-
call activate %CONDA_ENV%
18+
call activate pandas-dev
1919
conda list
2020

2121
if %errorlevel% neq 0 exit /b %errorlevel%

ci/incremental/setup_conda_environment.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ set -v -e
55
CONDA_INSTALL="conda install -q -y"
66
PIP_INSTALL="pip install -q"
77

8+
89
# Deactivate any environment
910
source deactivate
1011
# Display root environment (for debugging)
1112
conda list
1213
# Clean up any left-over from a previous build
1314
# (note workaround for https://github.com/conda/conda/issues/2679:
1415
# `conda env remove` issue)
15-
conda remove --all -q -y -n $CONDA_ENV
16+
conda remove --all -q -y -n pandas-dev
1617

1718
echo
1819
echo "[create env]"
19-
time conda env create -q -n "${CONDA_ENV}" --file="${ENV_FILE}" || exit 1
20+
time conda env create -q --file="${ENV_FILE}" || exit 1
2021

21-
# Activate first
2222
set +v
23-
source activate $CONDA_ENV
23+
source activate pandas-dev
2424
set -v
2525

2626
# remove any installed pandas package

ci/install_travis.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ echo
8080
echo "[create env]"
8181

8282
# create our environment
83-
time conda env create -q -n pandas --file="${ENV_FILE}" || exit 1
83+
time conda env create -q --file="${ENV_FILE}" || exit 1
8484

85-
source activate pandas
85+
source activate pandas-dev
8686

8787
# remove any installed pandas package
8888
# w/o removing anything else

ci/script_multi.sh

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
echo "[script multi]"
44

5-
source activate pandas
6-
75
if [ -n "$LOCALE_OVERRIDE" ]; then
86
export LC_ALL="$LOCALE_OVERRIDE";
97
export LANG="$LOCALE_OVERRIDE";

ci/script_single.sh

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
echo "[script_single]"
44

5-
source activate pandas
6-
75
if [ -n "$LOCALE_OVERRIDE" ]; then
86
echo "Setting LC_ALL and LANG to $LOCALE_OVERRIDE"
97
export LC_ALL="$LOCALE_OVERRIDE";

ci/upload_coverage.sh

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ if [ -z "$COVERAGE" ]; then
55
exit 0
66
fi
77

8-
source activate pandas
98

109
echo "uploading coverage"
1110
bash <(curl -s https://codecov.io/bash) -Z -c -F single -f /tmp/cov-single.xml

0 commit comments

Comments
 (0)