Skip to content

Commit

Permalink
BLD: Add Pandas 0.19.2 to build matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
Peque authored and richafrank committed Jul 10, 2018
1 parent 845b33d commit 755f519
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 6 deletions.
13 changes: 11 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,13 @@ env:
# See https://docs.travis-ci.com/api#external-apis.
- secure: "qQ3vMSXUybUyKljJjgcVT9YaWcZ0PkdLZSFj6BVuo82SWO7e4L+hC8pqsa1Sm/EjyetVwfKk5lkvruPpro++8hDPLq3ahNOMmm4axfcWvACpW+acD/VCA5D8Dxz2ohrvpwsqo7BmIV6OUtIO5JeePHP1SqaIdVZFJ0pIAZToEWQ="
- CONDA_ROOT_PYTHON_VERSION: "2.7"
matrix:
- NUMPY_VERSION=1.11.1 SCIPY_VERSION=0.17.1
- NUMPY_VERSION=1.11.1
- PANDAS_VERSION=0.18.1
- SCIPY_VERSION=0.17.1
matrix:
include:
- python: 3.5
env: PANDAS_VERSION=0.19.2
cache:
directories:
- $HOME/.cache/.pip/
Expand All @@ -28,6 +33,10 @@ before_install:
- chmod +x miniconda.sh
- ./miniconda.sh -b -p $HOME/miniconda
- export PATH="$HOME/miniconda/bin:$PATH"
- sed -i "s/numpy==.*/numpy==$NUMPY_VERSION/" etc/requirements.txt
- sed -i "s/pandas==.*/pandas==$PANDAS_VERSION/" etc/requirements.txt
- sed -i "s/scipy==.*/scipy==$SCIPY_VERSION/" etc/requirements.txt
- cat etc/requirements.txt
install:
- conda info -a
- conda install conda=4.3.30 conda-build=3.0.28 anaconda-client=1.6.3 --yes -q
Expand Down
6 changes: 6 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ environment:
- PYTHON_VERSION: "2.7"
- PYTHON_VERSION: "3.5"

- PYTHON_VERSION: "3.5"
PYTHON_ARCH: "64"
PANDAS_VERSION: "0.19.2"
NUMPY_VERSION: "1.11.1"
SCIPY_VERSION: "0.17.1"

# We always use a 64-bit machine, but can build x86 distributions
# with the PYTHON_ARCH variable (which is used by CMD_IN_ENV).
platform:
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,7 @@ def _filter_requirements(lines_iter, filter_names=None,

REQ_UPPER_BOUNDS = {
'bcolz': '<1',
'pandas': '<0.19',
'pandas-datareader': '<0.6', # 0.6.0 requires pandas >=0.19.2
'pandas': '<=0.22',
'networkx': '<2.0',
}

Expand Down
7 changes: 5 additions & 2 deletions tests/pipeline/test_blaze.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
from numpy.testing.utils import assert_array_almost_equal
from odo import odo
import pandas as pd
from pandas.util.testing import assert_frame_equal
from toolz import keymap, valmap, concatv
from toolz.curried import operator as op

Expand All @@ -39,7 +38,11 @@
tmp_asset_finder,
)
from zipline.testing.fixtures import WithAssetFinder
from zipline.testing.predicates import assert_equal, assert_isidentical
from zipline.testing.predicates import (
assert_equal,
assert_frame_equal,
assert_isidentical,
)
from zipline.utils.numpy_utils import float64_dtype, int64_dtype
from zipline.utils.pandas_utils import empty_dataframe

Expand Down

0 comments on commit 755f519

Please sign in to comment.