Skip to content

Remove duplicated code and fix travis #6017

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
3 commits merged into from Jan 20, 2014
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
7 changes: 4 additions & 3 deletions ci/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ pip install wheel
# comment this line to disable the fetching of wheel files
base_url=http://cache27diy-cpycloud.rhcloud.com
wheel_box=${TRAVIS_PYTHON_VERSION}${JOB_TAG}
PIP_ARGS+=" -I --use-wheel --find-links=$base_url/$wheel_box/"
PIP_ARGS+=" -I --use-wheel --find-links=$base_url/$wheel_box/ --allow-external --allow-insecure"

# Force virtualenv to accpet system_site_packages
# Force virtualenv to accept system_site_packages
rm -f $VIRTUAL_ENV/lib/python$TRAVIS_PYTHON_VERSION/no-global-site-packages.txt


Expand All @@ -49,11 +49,12 @@ if [ -n "$LOCALE_OVERRIDE" ]; then
time sudo locale-gen "$LOCALE_OVERRIDE"
fi

time pip install $PIP_ARGS -r ci/requirements-${wheel_box}.txt

# we need these for numpy
time sudo apt-get $APT_ARGS install libatlas-base-dev gfortran

time pip install $PIP_ARGS -r ci/requirements-${wheel_box}.txt


# Need to enable for locale testing. The location of the locale file(s) is
# distro specific. For example, on Arch Linux all of the locales are in a
Expand Down
6 changes: 1 addition & 5 deletions pandas/core/series.py
Original file line number Diff line number Diff line change
Expand Up @@ -1349,11 +1349,7 @@ def describe(self, percentile_width=50):
-------
desc : Series
"""
try:
from collections import Counter
except ImportError: # pragma: no cover
# For Python < 2.7, we include a local copy of this:
from pandas.util.counter import Counter
from pandas.compat import Counter

if self.dtype == object:
names = ['count', 'unique']
Expand Down
296 changes: 0 additions & 296 deletions pandas/util/counter.py

This file was deleted.