Skip to content

Commit be4a63f

Browse files
committed
BUG: testing on windows
- we are passing builds which actually have an error - fix the small dtype issues Author: Jeff Reback <[email protected]> Closes #15445 from jreback/windows and squashes the following commits: a5b7fb3 [Jeff Reback] change integer to power comparisions eab15c4 [Jeff Reback] don't force remove pandas cf3b9bd [Jeff Reback] more windows fixing efe6a76 [Jeff Reback] add cython to build 8194e63 [Jeff Reback] don't use appveyor recipe, just build inplace e064825 [Jeff Reback] TST: resample dtype issue xref #15418 10d9b26 [Jeff Reback] TST: run windows tests so failures show up in appeveyor
1 parent 29aeffb commit be4a63f

File tree

8 files changed

+13
-58
lines changed

8 files changed

+13
-58
lines changed

appveyor.yml

+5-7
Original file line numberDiff line numberDiff line change
@@ -78,21 +78,19 @@ install:
7878
# this is now the downloaded conda...
7979
- cmd: conda info -a
8080

81-
# build em using the local source checkout in the correct windows env
82-
- cmd: '%CMD_IN_ENV% conda build ci\appveyor.recipe -q'
83-
8481
# create our env
85-
- cmd: conda create -q -n pandas python=%PYTHON_VERSION% pytest
82+
- cmd: conda create -q -n pandas python=%PYTHON_VERSION% cython pytest
8683
- cmd: activate pandas
8784
- SET REQ=ci\requirements-%PYTHON_VERSION%-%PYTHON_ARCH%.run
8885
- cmd: echo "installing requirements from %REQ%"
8986
- cmd: conda install -n pandas -q --file=%REQ%
9087
- cmd: conda list -n pandas
9188
- cmd: echo "installing requirements from %REQ% - done"
92-
- ps: conda install -n pandas (conda build ci\appveyor.recipe -q --output)
89+
90+
# build em using the local source checkout in the correct windows env
91+
- cmd: '%CMD_IN_ENV% python setup.py build_ext --inplace'
9392

9493
test_script:
9594
# tests
9695
- cmd: activate pandas
97-
- cmd: cd \
98-
- cmd: python -c "import pandas; pandas.test(['--skip-slow', '--skip-network'])"
96+
- cmd: test.bat

ci/appveyor.recipe/bld.bat

-2
This file was deleted.

ci/appveyor.recipe/build.sh

-2
This file was deleted.

ci/appveyor.recipe/meta.yaml

-37
This file was deleted.

pandas/tests/indexing/test_timedelta.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ def test_boolean_indexing(self):
1313
[0, 1, 2, 10, 4, 5, 6, 7, 8, 9],
1414
[10, 10, 10, 3, 4, 5, 6, 7, 8, 9]]
1515
for cond, data in zip(conditions, expected_data):
16-
result = df.copy()
17-
result.loc[cond, 'x'] = 10
16+
result = df.assign(x=df.mask(cond, 10).astype('int64'))
1817
expected = pd.DataFrame(data,
1918
index=pd.to_timedelta(range(10), unit='s'),
2019
columns=['x'])

pandas/tests/test_expressions.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
from pandas.core.api import DataFrame, Panel
1414
from pandas.computation import expressions as expr
15-
from pandas import compat, _np_version_under1p12
15+
from pandas import compat, _np_version_under1p11
1616
from pandas.util.testing import (assert_almost_equal, assert_series_equal,
1717
assert_frame_equal, assert_panel_equal,
1818
assert_panel4d_equal, slow)
@@ -70,10 +70,10 @@ def run_arithmetic(self, df, other, assert_func, check_dtype=False,
7070
operations.append('div')
7171
for arith in operations:
7272

73-
# numpy >= 1.12 doesn't handle integers
73+
# numpy >= 1.11 doesn't handle integers
7474
# raised to integer powers
7575
# https://github.com/pandas-dev/pandas/issues/15363
76-
if arith == 'pow' and not _np_version_under1p12:
76+
if arith == 'pow' and not _np_version_under1p11:
7777
continue
7878

7979
operator_name = arith
@@ -272,10 +272,10 @@ def testit():
272272
for op, op_str in [('add', '+'), ('sub', '-'), ('mul', '*'),
273273
('div', '/'), ('pow', '**')]:
274274

275-
# numpy >= 1.12 doesn't handle integers
275+
# numpy >= 1.11 doesn't handle integers
276276
# raised to integer powers
277277
# https://github.com/pandas-dev/pandas/issues/15363
278-
if op == 'pow' and not _np_version_under1p12:
278+
if op == 'pow' and not _np_version_under1p11:
279279
continue
280280

281281
if op == 'div':

pandas/tests/tseries/test_resample.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1944,7 +1944,7 @@ def test_resample_nunique_with_date_gap(self):
19441944
index = pd.date_range('1-1-2000', '2-15-2000', freq='h')
19451945
index2 = pd.date_range('4-15-2000', '5-15-2000', freq='h')
19461946
index3 = index.append(index2)
1947-
s = pd.Series(range(len(index3)), index=index3)
1947+
s = pd.Series(range(len(index3)), index=index3, dtype='int64')
19481948
r = s.resample('M')
19491949

19501950
# Since all elements are unique, these should all be the same

test.bat

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
:: test on windows
22

3-
:: nosetests --exe -A "not slow and not network and not disabled" pandas %*
4-
pytest pandas
3+
pytest --skip-slow --skip-network pandas

0 commit comments

Comments
 (0)