Skip to content

CI: fixup windows builds #12159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

CI: fixup windows builds #12159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions conda.recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions pandas/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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

9 changes: 4 additions & 5 deletions pandas/compat/numpy_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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?
Expand All @@ -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):
Expand Down