Skip to content

CI: Fixes to conda environment names #23866

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
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
88bc2b7
change pandas to pandas-dev
charlesdong1991 Nov 22, 2018
fc88e2b
add source activate
charlesdong1991 Nov 22, 2018
fb34dcc
remove source activate
charlesdong1991 Nov 22, 2018
04e721c
clean the script
charlesdong1991 Nov 22, 2018
cd81131
debug
charlesdong1991 Nov 22, 2018
463be05
debug
charlesdong1991 Nov 22, 2018
6efdedd
add pandas-dev back at two lines
charlesdong1991 Nov 23, 2018
24bc4f6
change pandas to pandas-dev
charlesdong1991 Nov 22, 2018
28a3ebf
add source activate
charlesdong1991 Nov 22, 2018
9f56258
remove source activate
charlesdong1991 Nov 22, 2018
bf6bca2
clean the script
charlesdong1991 Nov 22, 2018
2c43b2f
debug
charlesdong1991 Nov 22, 2018
3a2a193
debug
charlesdong1991 Nov 22, 2018
bacb230
add pandas-dev back at two lines
charlesdong1991 Nov 23, 2018
393f754
test again after catching the latest master
charlesdong1991 Nov 23, 2018
840c566
Merge branch 'conda_env_name' of github.com:charlesdong1991/pandas in…
charlesdong1991 Nov 23, 2018
d969685
debugging
charlesdong1991 Nov 23, 2018
a0a978a
debugging
charlesdong1991 Nov 23, 2018
e024ba0
debugging
charlesdong1991 Nov 23, 2018
26df0d4
debugging
charlesdong1991 Nov 23, 2018
53f8eaa
debugging
charlesdong1991 Nov 23, 2018
de8c1bc
debugging
charlesdong1991 Nov 23, 2018
3b6d646
debugging
charlesdong1991 Nov 23, 2018
1d9e93a
debugging
charlesdong1991 Nov 23, 2018
e3c9fc1
debugging
charlesdong1991 Nov 23, 2018
603bd0b
debugging
charlesdong1991 Nov 23, 2018
8a37dd0
debugging
charlesdong1991 Nov 23, 2018
e59c787
debugging
charlesdong1991 Nov 23, 2018
4b0b03e
debugging
charlesdong1991 Nov 23, 2018
45e5f06
debugging
charlesdong1991 Nov 23, 2018
1c4ddfb
debugging
charlesdong1991 Nov 24, 2018
61b7f6f
debugging
charlesdong1991 Nov 24, 2018
997d680
debugging
charlesdong1991 Nov 24, 2018
49231a7
debugging
charlesdong1991 Nov 24, 2018
a0331bf
Some more fixes
datapythonista Nov 24, 2018
adea341
Merge branch 'conda_env_name_backup_backup' of github.com:charlesdong…
datapythonista Nov 24, 2018
afe3b1f
Removing unneeded activation
datapythonista Nov 24, 2018
fbde055
fixing wrong environment name in circle
datapythonista Nov 24, 2018
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
10 changes: 8 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,13 @@ jobs:
name: build
command: |
./ci/circle/install_circle.sh
./ci/circle/show_circle.sh
export PATH="$MINICONDA_DIR/bin:$PATH"
source activate pandas-dev
python -c "import pandas; pandas.show_versions();"
- run:
name: test
command: ./ci/circle/run_circle.sh --skip-slow --skip-network
command: |
export PATH="$MINICONDA_DIR/bin:$PATH"
source activate pandas-dev
echo "pytest --strict --durations=10 --color=no --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml --skip-slow --skip-network pandas"
pytest --strict --durations=10 --color=no --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml --skip-slow --skip-network pandas
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ before_script:

script:
- echo "script start"
- source activate pandas-dev
- ci/run_build_docs.sh
- ci/script_single.sh
- ci/script_multi.sh
Expand All @@ -115,7 +116,7 @@ after_success:

after_script:
- echo "after_script start"
- source activate pandas && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
- source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
- if [ -e test-data-single.xml ]; then
ci/print_skipped.py test-data-single.xml;
fi
Expand Down
7 changes: 3 additions & 4 deletions ci/azure/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,17 @@ jobs:
py27_np_19:
ENV_FILE: ci/deps/azure-27-compat.yaml
CONDA_PY: "27"
CONDA_ENV: pandas
TEST_ARGS: "--skip-slow --skip-network"

py36_locale:
ENV_FILE: ci/deps/azure-37-locale.yaml
CONDA_PY: "37"
CONDA_ENV: pandas
TEST_ARGS: "--skip-slow --skip-network"
LOCALE_OVERRIDE: "zh_CN.UTF-8"

py36_locale_slow:
ENV_FILE: ci/deps/azure-36-locale_slow.yaml
CONDA_PY: "36"
CONDA_ENV: pandas
TEST_ARGS: "--only-slow --skip-network"

steps:
Expand All @@ -39,17 +36,19 @@ jobs:
displayName: 'Before Install'
- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas-dev
ci/incremental/build.sh
displayName: 'Build'
- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas-dev
ci/script_single.sh
ci/script_multi.sh
echo "[Test done]"
displayName: 'Test'
- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
- task: PublishTestResults@2
inputs:
testResultsFiles: 'test-data-*.xml'
Expand Down
7 changes: 4 additions & 3 deletions ci/azure/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ jobs:
py35_np_120:
ENV_FILE: ci/deps/azure-macos-35.yaml
CONDA_PY: "35"
CONDA_ENV: pandas
TEST_ARGS: "--skip-slow --skip-network"

steps:
Expand All @@ -26,17 +25,19 @@ jobs:
displayName: 'Before Install'
- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas-dev
ci/incremental/build.sh
displayName: 'Build'
- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas-dev
ci/script_single.sh
ci/script_multi.sh
echo "[Test done]"
displayName: 'Test'
- script: |
export PATH=$HOME/miniconda3/bin:$PATH
source activate pandas && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
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 @@ -65,4 +66,4 @@ jobs:
# note that this will produce $LASTEXITCODE=1
Write-Error "$($matches[1]) tests failed"
}
displayName: Check for test failures
displayName: Check for test failures
4 changes: 2 additions & 2 deletions ci/azure/windows-py27.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ jobs:
py36_np121:
ENV_FILE: ci/deps/azure-windows-27.yaml
CONDA_PY: "27"
CONDA_ENV: pandas

steps:
- task: CondaEnvironment@1
Expand All @@ -33,10 +32,11 @@ jobs:
ci\\incremental\\setup_conda_environment.cmd
displayName: 'Before Install'
- script: |
call activate pandas-dev
ci\\incremental\\build.cmd
displayName: 'Build'
- script: |
call activate %CONDA_ENV%
call activate pandas-dev
pytest --junitxml=test-data.xml --skip-slow --skip-network pandas -n 2 -r sxX --strict --durations=10 %*
displayName: 'Test'
- task: PublishTestResults@2
Expand Down
6 changes: 3 additions & 3 deletions ci/azure/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ jobs:
py36_np14:
ENV_FILE: ci/deps/azure-windows-36.yaml
CONDA_PY: "36"
CONDA_ENV: pandas

steps:
- task: CondaEnvironment@1
Expand All @@ -24,10 +23,11 @@ jobs:
ci\\incremental\\setup_conda_environment.cmd
displayName: 'Before Install'
- script: |
call activate pandas-dev
ci\\incremental\\build.cmd
displayName: 'Build'
- script: |
call activate %CONDA_ENV%
call activate pandas-dev
pytest --junitxml=test-data.xml --skip-slow --skip-network pandas -n 2 -r sxX --strict --durations=10 %*
displayName: 'Test'
- task: PublishTestResults@2
Expand All @@ -46,4 +46,4 @@ jobs:
# note that this will produce $LASTEXITCODE=1
Write-Error "$($matches[1]) tests failed"
}
displayName: Check for test failures
displayName: Check for test failures
2 changes: 0 additions & 2 deletions ci/build_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ if [ "$DOC" ]; then

echo "Will build docs"

source activate pandas

echo ###############################
echo # Log file for the doc build #
echo ###############################
Expand Down
4 changes: 2 additions & 2 deletions ci/circle/install_circle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ fi

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

source activate pandas
source activate pandas-dev

# remove any installed pandas package
# w/o removing anything else
Expand Down
9 changes: 0 additions & 9 deletions ci/circle/run_circle.sh

This file was deleted.

8 changes: 0 additions & 8 deletions ci/circle/show_circle.sh

This file was deleted.

1 change: 0 additions & 1 deletion ci/code_checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ echo "inside $0"
[[ -z "$1" || "$1" == "lint" || "$1" == "patterns" || "$1" == "doctests" || "$1" == "dependencies" ]] \
|| { echo "Unknown command $1. Usage: $0 [lint|patterns|doctests|dependencies]"; exit 9999; }

source activate pandas
BASE_DIR="$(dirname $0)/.."
RET=0
CHECK=$1
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-27-compat.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pandas
name: pandas-dev
channels:
- defaults
- conda-forge
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-36-locale_slow.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pandas
name: pandas-dev
channels:
- defaults
- conda-forge
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-37-locale.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pandas
name: pandas-dev
channels:
- defaults
- conda-forge
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-macos-35.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pandas
name: pandas-dev
channels:
- defaults
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-windows-27.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pandas
name: pandas-dev
channels:
- defaults
- conda-forge
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-windows-36.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pandas
name: pandas-dev
channels:
- defaults
- conda-forge
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/circle-36-locale.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pandas
name: pandas-dev
channels:
- defaults
- conda-forge
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-27-locale.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pandas
name: pandas-dev
channels:
- defaults
- conda-forge
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-27.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pandas
name: pandas-dev
channels:
- defaults
- conda-forge
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-36-doc.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pandas
name: pandas-dev
channels:
- defaults
- conda-forge
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-36-slow.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pandas
name: pandas-dev
channels:
- defaults
- conda-forge
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-36.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pandas
name: pandas-dev
channels:
- defaults
- conda-forge
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-37-numpydev.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pandas
name: pandas-dev
channels:
- defaults
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-37.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pandas
name: pandas-dev
channels:
- defaults
- conda-forge
Expand Down
1 change: 0 additions & 1 deletion ci/incremental/build.cmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@rem https://github.com/numba/numba/blob/master/buildscripts/incremental/build.cmd
call activate %CONDA_ENV%

@rem Build numba extensions without silencing compile errors
python setup.py build_ext -q --inplace
Expand Down
2 changes: 0 additions & 2 deletions ci/incremental/build.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/bash

source activate $CONDA_ENV

# Make sure any error below is reported as such
set -v -e

Expand Down
6 changes: 3 additions & 3 deletions ci/incremental/setup_conda_environment.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ call deactivate
@rem Display root environment (for debugging)
conda list
@rem Clean up any left-over from a previous build
conda remove --all -q -y -n %CONDA_ENV%
conda remove --all -q -y -n pandas-dev
@rem Scipy, CFFI, jinja2 and IPython are optional dependencies, but exercised in the test suite
conda env create -n %CONDA_ENV% --file=ci\deps\azure-windows-%CONDA_PY%.yaml
conda env create --file=ci\deps\azure-windows-%CONDA_PY%.yaml

call activate %CONDA_ENV%
Copy link
Member

Choose a reason for hiding this comment

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

I think this, and another one deleted, need to be moved to .travis.yml before those scripts are called

Copy link
Member

Choose a reason for hiding this comment

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

same comment as above

call activate pandas-dev
conda list

if %errorlevel% neq 0 exit /b %errorlevel%
8 changes: 4 additions & 4 deletions ci/incremental/setup_conda_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@ set -v -e
CONDA_INSTALL="conda install -q -y"
PIP_INSTALL="pip install -q"


# Deactivate any environment
source deactivate
# Display root environment (for debugging)
conda list
# Clean up any left-over from a previous build
# (note workaround for https://github.com/conda/conda/issues/2679:
# `conda env remove` issue)
conda remove --all -q -y -n $CONDA_ENV
conda remove --all -q -y -n pandas-dev

echo
echo "[create env]"
time conda env create -q -n "${CONDA_ENV}" --file="${ENV_FILE}" || exit 1
time conda env create -q --file="${ENV_FILE}" || exit 1

# Activate first
set +v
source activate $CONDA_ENV
source activate pandas-dev
set -v

# remove any installed pandas package
Expand Down
4 changes: 2 additions & 2 deletions ci/install_travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ echo
echo "[create env]"

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

source activate pandas
source activate pandas-dev

# remove any installed pandas package
# w/o removing anything else
Expand Down
2 changes: 0 additions & 2 deletions ci/script_multi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

echo "[script multi]"

source activate pandas

if [ -n "$LOCALE_OVERRIDE" ]; then
export LC_ALL="$LOCALE_OVERRIDE";
echo "Setting LC_ALL to $LOCALE_OVERRIDE"
Expand Down
2 changes: 0 additions & 2 deletions ci/script_single.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

echo "[script_single]"

source activate pandas

if [ -n "$LOCALE_OVERRIDE" ]; then
echo "Setting LC_ALL and LANG to $LOCALE_OVERRIDE"
export LC_ALL="$LOCALE_OVERRIDE";
Expand Down
1 change: 0 additions & 1 deletion ci/upload_coverage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ if [ -z "$COVERAGE" ]; then
exit 0
fi

source activate pandas

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