Skip to content

Commit 76f689d

Browse files
Respond to comments from jreback
1 parent 278dd06 commit 76f689d

14 files changed

+10
-18
lines changed

ci/requirements-2.6.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,3 @@ numexpr=1.4.2
1414
pymysql=0.6.0
1515
sqlalchemy=0.7.8
1616
xlsxwriter=0.4.6
17-
blosc

ci/requirements-2.7.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,3 @@ beautiful-soup=4.2.1
2323
httplib2=0.8
2424
python-gflags=2.0
2525
google-api-python-client=1.2
26-
blosc

ci/requirements-2.7_32.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@ matplotlib
99
openpyxl
1010
xlrd
1111
scipy
12-
blosc

ci/requirements-2.7_64.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@ matplotlib
99
openpyxl
1010
xlrd
1111
scipy
12-
blosc

ci/requirements-2.7_LOCALE.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ scipy=0.11.0
1616
beautiful-soup=4.2.1
1717
statsmodels=0.4.3
1818
bigquery=2.0.17
19-
blosc

ci/requirements-2.7_SLOW.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,3 @@ beautiful-soup
2323
httplib2
2424
python-gflags
2525
google-api-python-client
26-
blosc

ci/requirements-3.2.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,3 @@ html5lib
1313
scipy==0.12.0
1414
beautifulsoup4==4.2.1
1515
statsmodels==0.5.0
16-
blosc

ci/requirements-3.3.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,3 @@ lxml=3.2.1
1515
scipy
1616
beautiful-soup=4.2.1
1717
statsmodels
18-
blosc

ci/requirements-3.4.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ sqlalchemy
1717
bottleneck
1818
pymysql==0.6.3
1919
psycopg2
20-
blosc

ci/requirements-3.4_32.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ scipy
88
numexpr
99
pytables
1010
matplotlib
11-
blosc

ci/requirements-3.4_64.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ scipy
88
numexpr
99
pytables
1010
matplotlib
11-
blosc

ci/requirements-3.4_SLOW.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ sqlalchemy
1717
bottleneck
1818
pymysql
1919
psycopg2
20-
blosc

ci/script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fi
1616
"$TRAVIS_BUILD_DIR"/ci/build_docs.sh 2>&1 > /tmp/doc.log &
1717
# doc build log will be shown after tests
1818

19-
pip install -U blosc
19+
pip install -U blosc # See https://github.com/pydata/pandas/pull/9783
2020
python -c 'import blosc; blosc.print_versions()'
2121

2222
echo nosetests --exe -A "$NOSE_ARGS" pandas --with-xunit --xunit-file=/tmp/nosetests.xml

pandas/io/tests/test_packers.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -447,18 +447,22 @@ def test_sparse_panel(self):
447447

448448

449449
class TestCompression(TestPackers):
450+
"""See https://github.com/pydata/pandas/pull/9783
451+
"""
450452

451453
def setUp(self):
452454
super(TestCompression, self).setUp()
453455
data = {
454-
'A': np.arange(1000, dtype=float),
455-
'B': range(1000),
456+
'A': np.arange(1000, dtype=np.float64),
457+
'B': np.arange(1000, dtype=np.int32),
456458
'C': list(100 * 'abcdefghij'),
459+
'D': date_range(datetime.datetime(2015, 4, 1), periods=1000),
460+
'E': [datetime.timedelta(days=x) for x in range(1000)],
457461
}
458462
self.frame = {
459-
'float': DataFrame(dict([(k, data[k]) for k in ['A', 'A']])),
460-
'int': DataFrame(dict([(k, data[k]) for k in ['B', 'B']])),
461-
'mixed': DataFrame(dict([(k, data[k]) for k in ['A', 'B', 'C']])),
463+
'float': DataFrame(dict((k, data[k]) for k in ['A', 'A'])),
464+
'int': DataFrame(dict((k, data[k]) for k in ['B', 'B'])),
465+
'mixed': DataFrame(data),
462466
}
463467

464468
def test_plain(self):

0 commit comments

Comments
 (0)