Skip to content

Autodep #520

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 2 commits into from
Closed

Autodep #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edd5acd
One approach to requirements handling
gregglind Dec 21, 2011
57ef8ee
removed requirements.txt
gregglind Dec 21, 2011
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
1 change: 1 addition & 0 deletions pandas/core/datetools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
'install version 1.5!')
except ImportError: # pragma: no cover
print 'Please install python-dateutil via easy_install or some method!'
raise # otherwise a 2nd import won't show the message

import calendar

Expand Down
9 changes: 6 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,13 @@
except ImportError:
raise ImportError('require setuptools/distribute for Py3k')
setuptools_args = {'use_2to3': True,
'zip_safe': False,}
'zip_safe': False,
'install_requires': ['python-dateutil > 2','numpy'],
}
else:
setuptools_args = {}

setuptools_args = {
'install_requires': ['python-dateutil < 2','numpy'],
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this will work because I don't use setuptools in Python 2.x-- something about setuptools messes up the Cython-ing step and I've never found the time to dig in and figure out why

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pip in virtualenv comes with distribute which has no conflict with Cython at all. I just built the Cython bits on OSX (Py2.7). here is my pip freeze before the build:

Cython==0.15.1
distribute==0.6.24
numpy==1.6.1

pip install -e . # works fine.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, thanks


import numpy as np

Expand Down