Skip to content

Commit eedcadb

Browse files
committed
updated patches
1 parent 300a448 commit eedcadb

File tree

4 files changed

+20
-17
lines changed

4 files changed

+20
-17
lines changed

debian/patches/deb_nonversioneer_version

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
--- a/pandas/__init__.py
22
+++ b/pandas/__init__.py
3-
@@ -57,7 +57,4 @@ from pandas.util.print_versions import s
4-
import pandas.util.testing
3+
@@ -58,7 +58,4 @@ test = NoseTester().test
4+
del NoseTester
55

66
# use the closest tagged version if possible
77
-from ._version import get_versions
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
--- a/pandas/tests/test_frame.py
2-
+++ b/pandas/tests/test_frame.py
3-
@@ -4997,6 +4997,9 @@ class TestDataFrame(tm.TestCase, CheckIn
4-
tm.assert_frame_equal(df2.join(df1, how='left'), exp[['value2', 'value1']])
1+
--- a/pandas/tests/frame/test_constructors.py
2+
+++ b/pandas/tests/frame/test_constructors.py
3+
@@ -1860,6 +1860,9 @@ class TestDataFrameConstructors(tm.TestC
4+
assert_frame_equal(result, expected)
55

66
def test_from_records_sequencelike(self):
77
+ import platform
88
+ if platform.uname()[4].startswith('armv'):
99
+ raise nose.SkipTest("Fails on Debian arm boxes due to locales or whatelse")
10-
df = DataFrame({'A' : np.array(np.random.randn(6), dtype = np.float64),
11-
'A1': np.array(np.random.randn(6), dtype = np.float64),
12-
'B' : np.array(np.arange(6), dtype = np.int64),
10+
df = DataFrame({'A': np.array(np.random.randn(6), dtype=np.float64),
11+
'A1': np.array(np.random.randn(6), dtype=np.float64),
12+
'B': np.array(np.arange(6), dtype=np.int64),

debian/patches/deb_skip_test_precision_i386

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/pandas/io/tests/test_parsers.py
22
+++ b/pandas/io/tests/test_parsers.py
3-
@@ -3637,6 +3637,9 @@ class TestCParserLowMemory(ParserTests,
3+
@@ -4206,6 +4206,9 @@ class TestCParserLowMemory(CParserTests,
44
self.assertEqual(result.dtype, ex_dtype)
55

66
def test_precise_conversion(self):

debian/patches/deb_skip_test_pytables_failure

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,20 @@ Last-Update: 2014-02-04
1111

1212
--- a/pandas/io/tests/test_pytables.py
1313
+++ b/pandas/io/tests/test_pytables.py
14-
@@ -3069,7 +3069,12 @@ class TestHDFStore(Base, tm.TestCase):
14+
@@ -3230,9 +3230,13 @@ class TestHDFStore(Base, tm.TestCase):
1515

1616
# big selector along the columns
17-
selector = [ 'a','b','c' ] + [ 'a%03d' % i for i in range(60) ]
18-
- result = store.select('df', [Term("ts>=Timestamp('2012-02-01')"),Term('users=selector')])
17+
selector = ['a', 'b', 'c'] + ['a%03d' % i for i in range(60)]
18+
- result = store.select(
19+
- 'df', [Term("ts>=Timestamp('2012-02-01')"),
20+
- Term('users=selector')])
1921
+ try:
20-
+ result = store.select('df', [Term("ts>=Timestamp('2012-02-01')"),Term('users=selector')])
22+
+ result = store.select(
23+
+ 'df', [Term("ts>=Timestamp('2012-02-01')"),
24+
+ Term('users=selector')])
2125
+ except KeyError as e:
2226
+ if "No object named df in" in str(e):
2327
+ raise nose.SkipTest("Skipping the test due to catching known %s" % e)
24-
+
25-
expected = df[ (df.ts >= Timestamp('2012-02-01')) & df.users.isin(selector) ]
28+
expected = df[(df.ts >= Timestamp('2012-02-01')) &
29+
df.users.isin(selector)]
2630
tm.assert_frame_equal(expected, result)
27-

0 commit comments

Comments
 (0)