File tree Expand file tree Collapse file tree 3 files changed +13
-15
lines changed Expand file tree Collapse file tree 3 files changed +13
-15
lines changed Original file line number Diff line number Diff line change 66 number : {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
77
88source :
9- path : ../../
9+ path : ../
1010
1111requirements :
1212 build :
1313 - python
1414 - cython
1515 - numpy x.x
16- - libpython # [py2k and win]
1716 - setuptools
1817 - pytz
1918 - python-dateutil
Original file line number Diff line number Diff line change 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
149from pandas .compat .numpy_compat import *
1510
1611try :
2318 "extensions first." .format (module ))
2419
2520from datetime import datetime
26- import numpy as np
27-
2821from pandas .info import __doc__
2922
3023# let init-time option registration happen
5043from pandas .util .nosetester import NoseTester
5144test = NoseTester ().test
5245del 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+
Original file line number Diff line number Diff line change 11""" support numpy compatiblitiy across versions """
22
3+ import numpy as np
34from distutils .version import LooseVersion
45from 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?
1919_np_version_under1p11 = LooseVersion (_np_version ) < '1.11'
2020
2121if 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
2928def tz_replacer (s ):
You can’t perform that action at this time.
0 commit comments