Skip to content

Commit

Permalink
Revert "CI: pin jemalloc=4.4.0 (pandas-dev#16727)" (pandas-dev#16731)
Browse files Browse the repository at this point in the history
This reverts commit 09d8c22.
  • Loading branch information
jreback authored Jun 30, 2017
1 parent 6b729dd commit 7c27b9d
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ci/requirements-2.7.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ source activate pandas

echo "install 27"

conda install -n pandas -c conda-forge feather-format jemalloc=4.4.0
conda install -n pandas -c conda-forge feather-format
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 dask jemalloc=4.4.0
conda install -n pandas -c conda-forge pyarrow dask
2 changes: 1 addition & 1 deletion ci/requirements-3.5.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ source activate pandas

echo "install 35"

conda install -n pandas -c conda-forge feather-format jemalloc=4.4.0
conda install -n pandas -c conda-forge feather-format
1 change: 0 additions & 1 deletion ci/requirements-3.6.run
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ html5lib
jinja2
sqlalchemy
pymysql
jemalloc=4.4.0
feather-format
# psycopg2 (not avail on defaults ATM)
beautifulsoup4
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 nbsphinx pandoc jemalloc=4.4.0
conda install -n pandas -c conda-forge feather-format nbsphinx pandoc

conda install -n pandas -c r r rpy2 --yes

0 comments on commit 7c27b9d

Please sign in to comment.