SciPy stack support, nanshe dependencies, some changes from upstream (old)#8
SciPy stack support, nanshe dependencies, some changes from upstream (old)#8jakirkham wants to merge 125 commits intochaubold:fix/OSX10.9from
Conversation
…y between Python 2 and 3. Required by Matplotlib.
… and/or time manipulation. Used by Matplotlib.
…ser. Used by Matplotlib.
…vides match_hostname from Python 3 for Python 2. Required for tornado, which is used by both Matplotlib and iPython.
…working library. Required by Matplotlib and iPython.
…ake files ( six, pytz, python-dateutil, pyparsing, tornado ). These have now been included and added as dependencies. Did not add PyCXX or LibAgg as they are bundled with Matplotlib and we would rather use the version they have tested against as we don't use them elsewhere yet. Updated the comments to reflect this information. Should consider updating to a more recent version of Matplotlib, but that was not done here.
sphinxcontrib-napoleon: Added the third party Sphinx extension napoleon. This allows docstrings to be formatted using Google style or Numpy style. Both are very readable as docstrings. Also, it parses them in a way that Sphinx can handle for generating documentation.
…ac or Windows using anyreadline. Required by iPython.
…entation. Need by iPython. pyzmq: Added pyzmq. Provides Python bindings to ZeroMQ. Used by iPython.
…ne in a compatiable way for Mac and Windows. Uses the 1.2.1 ( last of version 1 ).
…d by pandas and hence statsmodels.
…NumPy. In particular, when nan values are present.
…r for linear analysis. Included essential dependencies. Did not include optional dependencies to deal with input and output formats ( e.g. Excel, Amazon, PyTables ) nor were any parsers included ( e.g. any version BeautifulSoup ). Regardless, actual analytical operations should work.
…vides more advanced statistical analysis.
…fr ( already included ). This is also required by gmpy, which provides Python bindings to these three libraries to allow the use of large precision numbers with high efficiency.
…s high precision numbers in Python.
…Provides support for high precision calculation using gmpy with its bindings to gmp, mpfr, and mpc. Part of the SciPy stack.
…ls. Used by Spyder.
…s added back to Qt and PyQt, it will remain broken. It raises an error message to this effect if anyone tries to build it. If WebKit is fixed, feel free to comment the error message and try out the build.
…tack. Includes everything in the SciPy stack and in a few cases a little extra. Does not include Spyder.
…hon. Provides method for loading and saving MATLAB v7.3 files. Will fallback to SciPy if the version is older.
…hindered some behavior (i.e. opening a subshell).
|
@chaubold Please let me know your thoughts. Also, please let me know if I should be creating the PR against a different branch. It looks like there might be some redundancy between our two branches. |
|
Hi John! Wow, thanks! You were doing some serious maintenance to your buildem fork! Stuart and I think it's best if we make the constracking branch a new ilastik-buildem master, as the original buildem master does not contain all dependencies we need to build the current ilastik binary. As soon as we did that, you could also put your branch in that repo for your ilastik developments. I'll keep you updated. |
|
Hey Carsten. You're welcome. Sorry it's kind of a mess. @fdiego and I have had some high expectation in terms of what we want to use and play with hence all the additions. I'm sure it will take some iteration to get this all cleaned up. I have moved the branch as you have suggested ( #9 ). @stuarteberg had mentioned that we are now using your buildem. So, I thought it would be good if we could consolidate a bit more. Certainly, this is not as high of a priority as what's planned for next week. Once you have time, I would be interested in your feedback. By all means, try and build. If you run into issues, let me know and I will try and help. Once we are confident that this works for you, we can focus on cleaning up the merge. |
No description provided.