Skip to content

Commit b7a3980

Browse files
authored
Merge pull request pandas-dev#368 from Frankkkkk/master
Arctic needs six as a dependency
2 parents e6695da + 955a5db commit b7a3980

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

setup.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
from setuptools import find_packages
2323
from setuptools.command.test import test as TestCommand
2424
from Cython.Build import cythonize
25-
import six
2625
import sys, os, platform
2726
if platform.system().lower() == 'darwin':
2827
# gcc-4.2 on Mac OS X does not work with OpenMP
@@ -59,6 +58,7 @@ def run_tests(self):
5958

6059
# import here, cause outside the eggs aren't loaded
6160
import pytest
61+
import six
6262

6363
args = [self.pytest_args] if isinstance(self.pytest_args, six.string_types) else list(self.pytest_args)
6464
args.extend(['--cov', 'arctic',
@@ -88,7 +88,8 @@ def run_tests(self):
8888
long_description='\n'.join((long_description, changelog)),
8989
cmdclass={'test': PyTest},
9090
ext_modules=cythonize(compress),
91-
setup_requires=["Cython",
91+
setup_requires=["six",
92+
"Cython",
9293
"numpy",
9394
"setuptools-git",
9495
],

0 commit comments

Comments
 (0)