Skip to content

Commit 9bc8243

Browse files
committed
CI: fixup windows builds
closes #12139 closes #12159 Author: Jeff Reback <[email protected]> Closes #12159 from jreback/winfix and squashes the following commits: cd3b8e5 [Jeff Reback] CI: remove libpython requirement from conda.recipie BLD: revise import order to correctly build py2.7 on windows xref #12127
1 parent e99d20e commit 9bc8243

File tree

3 files changed

+13
-15
lines changed

3 files changed

+13
-15
lines changed

conda.recipe/meta.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@ build:
66
number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
77

88
source:
9-
path: ../../
9+
path: ../
1010

1111
requirements:
1212
build:
1313
- python
1414
- cython
1515
- numpy x.x
16-
- libpython # [py2k and win]
1716
- setuptools
1817
- pytz
1918
- python-dateutil

pandas/__init__.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,8 @@
44

55
__docformat__ = 'restructuredtext'
66

7-
# use the closest tagged version if possible
8-
from ._version import get_versions
9-
v = get_versions()
10-
__version__ = v.get('closest-tag',v['version'])
11-
del get_versions, v
12-
137
# numpy compat
8+
import numpy as np
149
from pandas.compat.numpy_compat import *
1510

1611
try:
@@ -23,8 +18,6 @@
2318
"extensions first.".format(module))
2419

2520
from datetime import datetime
26-
import numpy as np
27-
2821
from pandas.info import __doc__
2922

3023
# let init-time option registration happen
@@ -50,3 +43,10 @@
5043
from pandas.util.nosetester import NoseTester
5144
test = NoseTester().test
5245
del NoseTester
46+
47+
# use the closest tagged version if possible
48+
from ._version import get_versions
49+
v = get_versions()
50+
__version__ = v.get('closest-tag',v['version'])
51+
del get_versions, v
52+

pandas/compat/numpy_compat.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
""" support numpy compatiblitiy across versions """
22

3+
import numpy as np
34
from distutils.version import LooseVersion
45
from pandas.compat import string_types, string_and_binary_types
5-
import numpy as np
66

77
# TODO: HACK for NumPy 1.5.1 to suppress warnings
88
# is this necessary?
@@ -19,11 +19,10 @@
1919
_np_version_under1p11 = LooseVersion(_np_version) < '1.11'
2020

2121
if LooseVersion(_np_version) < '1.7.0':
22-
from pandas import __version__
23-
raise ImportError('pandas {0} is incompatible with numpy < 1.7.0\n'
24-
'your numpy version is {1}.\n'
22+
raise ImportError('this version of pandas is incompatible with numpy < 1.7.0\n'
23+
'your numpy version is {0}.\n'
2524
'Please upgrade numpy to >= 1.7.0 to use '
26-
'this pandas version'.format(__version__, _np_version))
25+
'this pandas version'.format(_np_version))
2726

2827

2928
def tz_replacer(s):

0 commit comments

Comments
 (0)