Skip to content

Commit e86e99c

Browse files
author
y-p
committed
Merge pull request #6017 from y-p/PR_cln_counter
Remove duplicated code and fix travis
2 parents 82bcbb8 + fa7eeed commit e86e99c

File tree

3 files changed

+5
-304
lines changed

3 files changed

+5
-304
lines changed

ci/install.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ pip install wheel
3737
# comment this line to disable the fetching of wheel files
3838
base_url=http://cache27diy-cpycloud.rhcloud.com
3939
wheel_box=${TRAVIS_PYTHON_VERSION}${JOB_TAG}
40-
PIP_ARGS+=" -I --use-wheel --find-links=$base_url/$wheel_box/"
40+
PIP_ARGS+=" -I --use-wheel --find-links=$base_url/$wheel_box/ --allow-external --allow-insecure"
4141

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

4545

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

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

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

56+
time pip install $PIP_ARGS -r ci/requirements-${wheel_box}.txt
57+
5758

5859
# Need to enable for locale testing. The location of the locale file(s) is
5960
# distro specific. For example, on Arch Linux all of the locales are in a

pandas/core/series.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -1349,11 +1349,7 @@ def describe(self, percentile_width=50):
13491349
-------
13501350
desc : Series
13511351
"""
1352-
try:
1353-
from collections import Counter
1354-
except ImportError: # pragma: no cover
1355-
# For Python < 2.7, we include a local copy of this:
1356-
from pandas.util.counter import Counter
1352+
from pandas.compat import Counter
13571353

13581354
if self.dtype == object:
13591355
names = ['count', 'unique']

pandas/util/counter.py

-296
This file was deleted.

0 commit comments

Comments
 (0)