Skip to content

use / test modern conda recipe #18787

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 2 commits into from
Dec 19, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ matrix:
- python-gtk2
- dist: trusty
env:
- JOB="3.5" TEST_ARGS="--skip-slow --skip-network" COVERAGE=true
Copy link
Member

Choose a reason for hiding this comment

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

the coverage=true is not needed anymore?

- JOB="3.5_CONDA_BUILD_TEST" TEST_ARGS="--skip-slow --skip-network" CONDA_BUILD_TEST=true COVERAGE=true
- dist: trusty
env:
- JOB="3.6" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" CONDA_FORGE=true
Expand All @@ -62,7 +62,7 @@ matrix:
# In allow_failures
- dist: trusty
env:
- JOB="3.6_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true
- JOB="3.6_PIP_BUILD_TEST" TEST_ARGS="--skip-slow" PIP_BUILD_TEST=true
addons:
apt:
packages:
Expand All @@ -81,7 +81,7 @@ matrix:
- JOB="2.7_SLOW" SLOW=true
- dist: trusty
env:
- JOB="3.6_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true
- JOB="3.6_PIP_BUILD_TEST" TEST_ARGS="--skip-slow" PIP_BUILD_TEST=true
addons:
apt:
packages:
Expand Down
34 changes: 26 additions & 8 deletions ci/install_travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,13 @@ 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 @@ -116,7 +123,7 @@ if [ "$COVERAGE" ]; then
fi

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

# build but don't install
echo "[build em]"
Expand Down Expand Up @@ -155,23 +162,34 @@ echo "[removing installed pandas]"
conda remove pandas -y --force
pip uninstall -y pandas

if [ "$BUILD_TEST" ]; then
echo
echo "[no installed pandas]"
conda list pandas
pip list --format columns |grep pandas

# remove any installation
pip uninstall -y pandas
conda list pandas
pip list --format columns |grep pandas
# build and install
echo

if [ "$PIP_BUILD_TEST" ]; then

# build & install testing
echo ["building release"]
echo "[building release]"
bash scripts/build_dist_for_release.sh
conda uninstall -y cython
time pip install dist/*tar.gz || exit 1

elif [ "$CONDA_BUILD_TEST" ]; then

# build & install testing
echo "[building conda recipe]"
conda build ./conda.recipe --numpy 1.13 --python 3.5 -q --no-test

echo "[installing]"
conda install $(conda build ./conda.recipe --numpy 1.13 --python 3.5 --output) --force

else

# install our pandas
echo
echo "[running setup.py develop]"
python setup.py develop || exit 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ python=3.5*
python-dateutil
pytz
nomkl
numpy=1.11.3
numpy=1.13*
cython
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pytz
numpy=1.11.3
numpy=1.13*
openpyxl
xlsxwriter
xlrd
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source activate pandas

echo "install 35"
echo "install 35 CONDA_BUILD_TEST"

# pip install python-dateutil to get latest
conda remove -n pandas python-dateutil --force
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

source activate pandas

echo "install 36 BUILD_TEST"
echo "install 36 PIP_BUILD_TEST"

conda install -n pandas -c conda-forge pyarrow dask pyqt qtpy
2 changes: 1 addition & 1 deletion ci/script_multi.sh
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 [ "$BUILD_TEST" ]; then
if [ "$PIP_BUILD_TEST" ] || [ "$CONDA_BUILD_TEST" ]; then
echo "[build-test]"

echo "[env]"
Expand Down
2 changes: 1 addition & 1 deletion ci/script_single.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if [ "$SLOW" ]; then
TEST_ARGS="--only-slow --skip-network"
fi

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

elif [ "$DOC" ]; then
Expand Down
10 changes: 6 additions & 4 deletions conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package:
name: pandas
version: {{ GIT_DESCRIBE_TAG|replace("v","") }}
version: {{ environ.get('GIT_DESCRIBE_TAG','').replace('v', '', 1) }}

build:
number: {{ GIT_DESCRIBE_NUMBER|int }}
number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
{% if GIT_DESCRIBE_NUMBER|int == 0 %}string: np{{ CONDA_NPY }}py{{ CONDA_PY }}_0
{% else %}string: np{{ CONDA_NPY }}py{{ CONDA_PY }}_{{ GIT_BUILD_STR }}{% endif %}

Expand All @@ -14,12 +14,14 @@ requirements:
build:
- python
- cython
- numpy x.x
- {{ pin_compatible('numpy') }}
- setuptools >=3.3
- python-dateutil >=2.5.0
- pytz

run:
- python
- numpy x.x
- {{ pin_compatible('numpy') }}
- python-dateutil >=2.5.0
- pytz

Expand Down
4 changes: 4 additions & 0 deletions doc/source/whatsnew/v0.22.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,12 @@ If installed, we now require:
+-----------------+-----------------+----------+


Build Changes
^^^^^^^^^^^^^

- Building pandas for development now requires ``cython >= 0.24`` (:issue:`18613`)
- Building from source now explicity requires ``setuptools`` in ``setup.py`` (:issue:`18113`)
- Updated conda recipe to be in compliance with conda-build 3.0+ (:issue:`18002`)

.. _whatsnew_0220.api:

Expand Down