Skip to content

BLD: updated conda recipe to be conda-bld 3plus compliant #18592

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

Closed
Closed
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
- JOB="3.6_CONDA_BUILD_TEST" TEST_ARGS="--skip-slow --skip-network" CONDA_BUILD_TEST=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
8 changes: 6 additions & 2 deletions ci/install_travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ if [ "$COVERAGE" ]; then
fi

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

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

if [ "$BUILD_TEST" ]; then
if [ "$PIP_BUILD_TEST" ]; then

# remove any installation
pip uninstall -y pandas
Expand All @@ -167,6 +167,10 @@ if [ "$BUILD_TEST" ]; then
bash scripts/build_dist_for_release.sh
conda uninstall -y cython
time pip install dist/*tar.gz || exit 1

elif [ "$CONDA_BUILD_TEST" ]; then

conda build ./conda.recipe/ --numpy 1.11 --python 3.6 -q

else

Expand Down
6 changes: 0 additions & 6 deletions ci/requirements-3.5.build

This file was deleted.

2 changes: 0 additions & 2 deletions ci/requirements-3.5.pip

This file was deleted.

20 changes: 0 additions & 20 deletions ci/requirements-3.5.run

This file was deleted.

11 changes: 0 additions & 11 deletions ci/requirements-3.5.sh

This file was deleted.

Empty file.
Empty file.
7 changes: 7 additions & 0 deletions ci/requirements-3.6_CONDA_BUILD_TEST.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

source activate pandas

echo "install 36 CONDA_BUILD_TEST"

conda install conda-build
4 changes: 2 additions & 2 deletions conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ requirements:
build:
- python
- cython
- numpy x.x
- numpy
- setuptools >=3.3

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

Expand Down
7 changes: 6 additions & 1 deletion doc/source/whatsnew/v0.22.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,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 Expand Up @@ -336,4 +340,5 @@ Other
^^^^^

- Improved error message when attempting to use a Python keyword as an identifier in a ``numexpr`` backed query (:issue:`18221`)
-
-