Skip to content

Commit

Permalink
CI: partially revert pandas-dev#17065, un-pin pyarrow on some builds
Browse files Browse the repository at this point in the history
  • Loading branch information
jreback authored and alanbato committed Nov 10, 2017
1 parent 3ed5860 commit 307f0d9
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ci/requirements-2.7_BUILD_TEST.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ source activate pandas

echo "install 27 BUILD_TEST"

conda install -n pandas -c conda-forge pyarrow=0.4.1 dask
conda install -n pandas -c conda-forge pyarrow dask
2 changes: 1 addition & 1 deletion ci/requirements-3.6.run
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jinja2
sqlalchemy
pymysql
feather-format
pyarrow=0.4.1
pyarrow
# psycopg2 (not avail on defaults ATM)
beautifulsoup4
s3fs
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements-3.6_DOC.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ echo "[install DOC_BUILD deps]"

pip install pandas-gbq

conda install -n pandas -c conda-forge feather-format pyarrow=0.4.1 nbsphinx pandoc
conda install -n pandas -c conda-forge feather-format pyarrow nbsphinx pandoc

conda install -n pandas -c r r rpy2 --yes
2 changes: 1 addition & 1 deletion ci/requirements-3.6_WIN.run
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ xlrd
xlwt
scipy
feather-format
pyarrow=0.4.1
pyarrow
numexpr
pytables
matplotlib
Expand Down
2 changes: 1 addition & 1 deletion pandas/util/_print_versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ def show_versions(as_json=False):
("Cython", lambda mod: mod.__version__),
("numpy", lambda mod: mod.version.version),
("scipy", lambda mod: mod.version.version),
("pyarrow", lambda mod: mod.__version__),
("xarray", lambda mod: mod.__version__),
("IPython", lambda mod: mod.__version__),
("sphinx", lambda mod: mod.__version__),
Expand All @@ -95,7 +96,6 @@ def show_versions(as_json=False):
("s3fs", lambda mod: mod.__version__),
("pandas_gbq", lambda mod: mod.__version__),
("pandas_datareader", lambda mod: mod.__version__),
("pyarrow", lambda mod: mod.__version__),
]

deps_blob = list()
Expand Down

0 comments on commit 307f0d9

Please sign in to comment.