Skip to content

Move conda build and ASV check to cron job #19698

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.

Sign up for GitHub

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 4 commits into from
Feb 14, 2018
Merged

Move conda build and ASV check to cron job #19698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11687e9
CI: Remove ASV run
TomAugspurger Feb 14, 2018
edf5aba
CI: Removed conda build test
TomAugspurger Feb 14, 2018
9ee0c21
Removed asv.sh step
TomAugspurger Feb 14, 2018
b151fd8
Removed the ASV matrix item
TomAugspurger Feb 14, 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
12 changes: 2 additions & 10 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ matrix:
# In allow_failures
- dist: trusty
env:
- JOB="3.5_CONDA_BUILD_TEST" TEST_ARGS="--skip-slow --skip-network" CONDA_BUILD_TEST=true
- JOB="3.5" TEST_ARGS="--skip-slow --skip-network"
- dist: trusty
env:
- JOB="3.6" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" CONDA_FORGE=true COVERAGE=true
Expand All @@ -73,17 +73,13 @@ matrix:
env:
- JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
# In allow_failures
- dist: trusty
env:
- JOB="3.6_ASV" ASV=true
# In allow_failures
- dist: trusty
env:
- JOB="3.6_DOC" DOC=true
allow_failures:
- dist: trusty
env:
- JOB="3.5_CONDA_BUILD_TEST" TEST_ARGS="--skip-slow --skip-network" CONDA_BUILD_TEST=true
- JOB="3.5" TEST_ARGS="--skip-slow --skip-network"
- dist: trusty
env:
- JOB="2.7_SLOW" SLOW=true
Expand All @@ -97,9 +93,6 @@ matrix:
- dist: trusty
env:
- JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
- dist: trusty
env:
- JOB="3.6_ASV" ASV=true
- dist: trusty
env:
- JOB="3.6_DOC" DOC=true
Expand Down Expand Up @@ -135,7 +128,6 @@ script:
- ci/script_single.sh
- ci/script_multi.sh
- ci/lint.sh
- ci/asv.sh
- echo "checking imports"
- source activate pandas && python ci/check_imports.py
- echo "script done"
Expand Down
35 changes: 0 additions & 35 deletions ci/asv.sh
View file
Open in desktop

This file was deleted.

17 changes: 1 addition & 16 deletions ci/install_travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@ conda config --set ssl_verify false || exit 1
conda config --set quiet true --set always_yes true --set changeps1 false || exit 1
conda update -q conda

if [ "$CONDA_BUILD_TEST" ]; then
echo
echo "[installing conda-build]"
conda install conda-build
fi

echo
echo "[add channels]"
conda config --remove channels defaults || exit 1
Expand Down Expand Up @@ -122,7 +116,7 @@ if [ "$COVERAGE" ]; then
fi

echo
if [ -z "$PIP_BUILD_TEST" ] && [ -z "$CONDA_BUILD_TEST" ]; then
if [ -z "$PIP_BUILD_TEST" ] ; then

# build but don't install
echo "[build em]"
Expand Down Expand Up @@ -177,15 +171,6 @@ if [ "$PIP_BUILD_TEST" ]; then
conda uninstall -y cython
time pip install dist/*tar.gz || exit 1

elif [ "$CONDA_BUILD_TEST" ]; then

# build & install testing
echo "[building conda recipe]"
time conda build ./conda.recipe --python 3.5 -q --no-test || exit 1

echo "[installing]"
conda install pandas --use-local || exit 1

else

# install our pandas
Expand Down
0 ci/requirements-3.5_CONDA_BUILD_TEST.build → ci/requirements-3.5.build
View file
Open in desktop
File renamed without changes.
0 ci/requirements-3.5_CONDA_BUILD_TEST.pip → ci/requirements-3.5.pip
View file
Open in desktop
File renamed without changes.
0 ci/requirements-3.5_CONDA_BUILD_TEST.run → ci/requirements-3.5.run
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ci/requirements-3.5_CONDA_BUILD_TEST.sh → ci/requirements-3.5.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source activate pandas

echo "install 35 CONDA_BUILD_TEST"
echo "install 35"

# pip install python-dateutil to get latest
conda remove -n pandas python-dateutil --force
Expand Down
5 changes: 0 additions & 5 deletions ci/requirements-3.6_ASV.build
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions ci/requirements-3.6_ASV.run
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions ci/requirements-3.6_ASV.sh
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions ci/script_multi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fi
export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 4294967295))')
echo PYTHONHASHSEED=$PYTHONHASHSEED

if [ "$PIP_BUILD_TEST" ] || [ "$CONDA_BUILD_TEST" ]; then
if [ "$PIP_BUILD_TEST" ] ; then
echo "[build-test]"

echo "[env]"
Expand All @@ -37,9 +37,6 @@ if [ "$PIP_BUILD_TEST" ] || [ "$CONDA_BUILD_TEST" ]; then
elif [ "$DOC" ]; then
echo "We are not running pytest as this is a doc-build"

elif [ "$ASV" ]; then
echo "We are not running pytest as this is an asv-build"

elif [ "$COVERAGE" ]; then
echo pytest -s -n 2 -m "not single" --cov=pandas --cov-report xml:/tmp/cov-multiple.xml --junitxml=/tmp/multiple.xml --strict $TEST_ARGS pandas
pytest -s -n 2 -m "not single" --cov=pandas --cov-report xml:/tmp/cov-multiple.xml --junitxml=/tmp/multiple.xml --strict $TEST_ARGS pandas
Expand Down
5 changes: 1 addition & 4 deletions ci/script_single.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,12 @@ if [ "$SLOW" ]; then
TEST_ARGS="--only-slow --skip-network"
fi

if [ "$PIP_BUILD_TEST" ] || [ "$CONDA_BUILD_TEST" ]; then
if [ "$PIP_BUILD_TEST" ]; then
echo "We are not running pytest as this is a build test."

elif [ "$DOC" ]; then
echo "We are not running pytest as this is a doc-build"

elif [ "$ASV" ]; then
echo "We are not running pytest as this is an asv-build"

elif [ "$COVERAGE" ]; then
echo pytest -s -m "single" --strict --cov=pandas --cov-report xml:/tmp/cov-single.xml --junitxml=/tmp/single.xml $TEST_ARGS pandas
pytest -s -m "single" --strict --cov=pandas --cov-report xml:/tmp/cov-single.xml --junitxml=/tmp/single.xml $TEST_ARGS pandas
Expand Down