diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 279327b93c805..8264f5e9a952b 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -6,14 +6,13 @@ build: number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }} source: - path: ../../ + path: ../ requirements: build: - python - cython - numpy x.x - - libpython # [py2k and win] - setuptools - pytz - python-dateutil diff --git a/pandas/__init__.py b/pandas/__init__.py index 4ba6dbe6a8063..b8c1f082b6cb3 100644 --- a/pandas/__init__.py +++ b/pandas/__init__.py @@ -4,13 +4,8 @@ __docformat__ = 'restructuredtext' -# use the closest tagged version if possible -from ._version import get_versions -v = get_versions() -__version__ = v.get('closest-tag',v['version']) -del get_versions, v - # numpy compat +import numpy as np from pandas.compat.numpy_compat import * try: @@ -23,8 +18,6 @@ "extensions first.".format(module)) from datetime import datetime -import numpy as np - from pandas.info import __doc__ # let init-time option registration happen @@ -50,3 +43,10 @@ from pandas.util.nosetester import NoseTester test = NoseTester().test del NoseTester + +# use the closest tagged version if possible +from ._version import get_versions +v = get_versions() +__version__ = v.get('closest-tag',v['version']) +del get_versions, v + diff --git a/pandas/compat/numpy_compat.py b/pandas/compat/numpy_compat.py index 726a20370f512..f7f5da40d01c5 100644 --- a/pandas/compat/numpy_compat.py +++ b/pandas/compat/numpy_compat.py @@ -1,8 +1,8 @@ """ support numpy compatiblitiy across versions """ +import numpy as np from distutils.version import LooseVersion from pandas.compat import string_types, string_and_binary_types -import numpy as np # TODO: HACK for NumPy 1.5.1 to suppress warnings # is this necessary? @@ -19,11 +19,10 @@ _np_version_under1p11 = LooseVersion(_np_version) < '1.11' if LooseVersion(_np_version) < '1.7.0': - from pandas import __version__ - raise ImportError('pandas {0} is incompatible with numpy < 1.7.0\n' - 'your numpy version is {1}.\n' + raise ImportError('this version of pandas is incompatible with numpy < 1.7.0\n' + 'your numpy version is {0}.\n' 'Please upgrade numpy to >= 1.7.0 to use ' - 'this pandas version'.format(__version__, _np_version)) + 'this pandas version'.format(_np_version)) def tz_replacer(s):