From d176d12d65825c61bb83d3e1e6811954bfde0377 Mon Sep 17 00:00:00 2001 From: Eddie Hebert Date: Mon, 1 Oct 2012 13:25:15 -0400 Subject: [PATCH 1/3] Reduces the libraries specified in requirements to the minimal amount needed to run unittests. Building the libraries installed by default to as few as possible. Removes pip run on removed requirements_sci.txt in CI script. --- etc/jenkins.sh | 1 - etc/requirements.txt | 8 ++++++++ etc/requirements_dev.txt | 33 --------------------------------- etc/requirements_sci.txt | 18 ------------------ 4 files changed, 8 insertions(+), 52 deletions(-) delete mode 100644 etc/requirements_sci.txt diff --git a/etc/jenkins.sh b/etc/jenkins.sh index fd3e60a9..ef1a9f28 100755 --- a/etc/jenkins.sh +++ b/etc/jenkins.sh @@ -12,7 +12,6 @@ mkvirtualenv zipline workon zipline ./etc/ordered_pip.sh ./etc/requirements.txt ./etc/ordered_pip.sh ./etc/requirements_dev.txt -./etc/ordered_pip.sh ./etc/requirements_sci.txt # Show what we have installed pip freeze diff --git a/etc/requirements.txt b/etc/requirements.txt index 9664715d..196a2588 100644 --- a/etc/requirements.txt +++ b/etc/requirements.txt @@ -6,3 +6,11 @@ iso8601==0.1.4 Logbook==0.3 blist==1.3.4 + +# Scientific Libraries + +pytz==2011n +numpy==1.6.1 +Cython==0.15.1 + +-e git+git://github.com/pydata/pandas.git@v0.9.0rc2#egg=pandas diff --git a/etc/requirements_dev.txt b/etc/requirements_dev.txt index d9015774..66d4e060 100644 --- a/etc/requirements_dev.txt +++ b/etc/requirements_dev.txt @@ -1,38 +1,5 @@ ipython==0.12 -# For debugger -fancycompleter==0.2 -pyrepl==0.8.2 -Pygments==1.5 -pdbpp==0.7.2 - - # Testing unittest2 nose==1.1.2 -coverage==3.5.1 -mock==0.7.2 -nosexcover==1.0.7 -pylint==0.25.1 - -# Documentation -docutils==0.8.1 -Sphinx==1.1.2 - -# Task running -Paver==1.0.5 -Paved==0.3 - -# pycco deps -Markdown==2.1.1 -Pycco==0.3.0 -pystache==0.4.0 -smartypants==1.6.0.3 -wsgiref==0.1.2 - -# misc -pycleaner==1.1.1 --e git://github.com/pydata/vbench.git#egg=vbench - -# profilers -yappi==0.62 diff --git a/etc/requirements_sci.txt b/etc/requirements_sci.txt deleted file mode 100644 index 24ec2aef..00000000 --- a/etc/requirements_sci.txt +++ /dev/null @@ -1,18 +0,0 @@ -# Date Related -pytz==2011n -python-dateutil==1.5 - -# Core scientific python -numpy>=1.6.1 -scipy>=0.10.0 - -#matplotlib==1.1.0 -#http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-1.1.0/matplotlib-1.1.0.tar.gz - -numexpr==2.0.1 -Cython==0.15.1 -patsy==0.1.0 --U git+git://github.com/pydata/pandas.git@v0.9.0rc2 -statsmodels>=0.5.0 -scikit-learn==0.11 - From 75d3578f047bf7581af56791462b2a5bd3b8496b Mon Sep 17 00:00:00 2001 From: Eddie Hebert Date: Mon, 1 Oct 2012 13:32:35 -0400 Subject: [PATCH 2/3] Removes ordered_pip.sh script. The ordered_pip script was needed to wrangle some dependency ordering problems that do not exist with the reduced set of dependencies. --- etc/jenkins.sh | 4 ++-- etc/ordered_pip.sh | 12 ------------ 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100755 etc/ordered_pip.sh diff --git a/etc/jenkins.sh b/etc/jenkins.sh index ef1a9f28..085b304a 100755 --- a/etc/jenkins.sh +++ b/etc/jenkins.sh @@ -10,8 +10,8 @@ source /usr/local/bin/virtualenvwrapper.sh mkvirtualenv zipline workon zipline -./etc/ordered_pip.sh ./etc/requirements.txt -./etc/ordered_pip.sh ./etc/requirements_dev.txt +pip install -r ./etc/requirements.txt +pip install -r ./etc/requirements_dev.txt # Show what we have installed pip freeze diff --git a/etc/ordered_pip.sh b/etc/ordered_pip.sh deleted file mode 100755 index 3db63eb1..00000000 --- a/etc/ordered_pip.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -e - -a=0 -while read line -do - if [[ -n "$line" && "$line" != \#* ]] ; then - #echo $line - pip install $line - fi - ((a = a + 1)) -done < $1 -echo "$0: Final package count is $a"; From a46273ed0fe9d7150ec1ef62f2b084c856a6806e Mon Sep 17 00:00:00 2001 From: Eddie Hebert Date: Tue, 2 Oct 2012 00:13:08 -0400 Subject: [PATCH 3/3] Removes documentation generation from jenkins.sh The current documentation is not currently used actively. Also, we are working towards not using Jenkins, in favor of something like travis-ci when zipline is open sourced, so we will have to be rethinking the documentation maintenance then. --- etc/jenkins.sh | 19 ----- etc/pycco.css | 186 ------------------------------------------------- 2 files changed, 205 deletions(-) delete mode 100644 etc/pycco.css diff --git a/etc/jenkins.sh b/etc/jenkins.sh index 085b304a..17d93ab0 100755 --- a/etc/jenkins.sh +++ b/etc/jenkins.sh @@ -16,26 +16,7 @@ pip install -r ./etc/requirements_dev.txt # Show what we have installed pip freeze -#documentation output -paver apidocs html -pycco ./zipline/*.py -d ./docs/_build/html/pycco/ -pycco ./zipline/finance/*.py -d ./docs/_build/html/pycco/finance -pycco ./zipline/test/*.py -d ./docs/_build/html/pycco/test -pycco ./zipline/transforms/*.py -d ./docs/_build/html/pycco/transforms -# use our custom css -cp ./etc/pycco.css ./docs/_build/html/pycco/ -cp ./etc/pycco.css ./docs/_build/html/pycco/finance -cp ./etc/pycco.css ./docs/_build/html/pycco/test -cp ./etc/pycco.css ./docs/_build/html/pycco/transforms - #run all the tests in test. see setup.cfg for flags. nosetests --config=jenkins_setup.cfg -I test_optimize -#run pylint checks -cp ./pylint.rcfile /mnt/jenkins/.pylintrc #default location for config file... -pylint -f parseable zipline > pylint.out - -#run sloccount analysis -sloccount --wide --details ./zipline > sloccount.sc - deactivate diff --git a/etc/pycco.css b/etc/pycco.css deleted file mode 100644 index 152370c4..00000000 --- a/etc/pycco.css +++ /dev/null @@ -1,186 +0,0 @@ -/*--------------------- Layout and Typography ----------------------------*/ -body { - font-family: 'Palatino Linotype', 'Book Antiqua', Palatino, FreeSerif, serif; - font-size: 16px; - line-height: 24px; - color: #252519; - margin: 0; padding: 0; -} -a { - color: #261a3b; -} - a:visited { - color: #261a3b; - } -p { - margin: 0 0 15px 0; -} -h1, h2, h3, h4, h5, h6 { - margin: 40px 0 15px 0; -} -h2, h3, h4, h5, h6 { - margin-top: 0; - } -#container, div.section { - position: relative; -} -#background { - position: fixed; - top: 0; left: 790px; right: 0; bottom: 0; - background: #f5f5ff; - border-left: 1px solid #e5e5ee; - z-index: -1; -} -#jump_to, #jump_page { - background: white; - -webkit-box-shadow: 0 0 25px #777; -moz-box-shadow: 0 0 25px #777; - -webkit-border-bottom-left-radius: 5px; -moz-border-radius-bottomleft: 5px; - font: 10px Arial; - text-transform: uppercase; - cursor: pointer; - text-align: right; -} -#jump_to, #jump_wrapper { - position: fixed; - right: 0; top: 0; - padding: 5px 10px; -} - #jump_wrapper { - padding: 0; - display: none; - } - #jump_to:hover #jump_wrapper { - display: block; - } - #jump_page { - padding: 5px 0 3px; - margin: 0 0 25px 25px; - } - #jump_page .source { - display: block; - padding: 5px 10px; - text-decoration: none; - border-top: 1px solid #eee; - } - #jump_page .source:hover { - background: #f5f5ff; - } - #jump_page .source:first-child { - } -div.docs { - float: left; - max-width: 710px; - min-width: 710px; - min-height: 5px; - padding: 10px 25px 1px 50px; - vertical-align: top; - text-align: left; -} - .docs pre { - margin: 15px 0 15px; - padding-left: 15px; - } - .docs p tt, .docs p code { - background: #f8f8ff; - border: 1px solid #dedede; - font-size: 12px; - padding: 0 0.2em; - } - .octowrap { - position: relative; - } - .octothorpe { - font: 12px Arial; - text-decoration: none; - color: #454545; - position: absolute; - top: 3px; left: -20px; - padding: 1px 2px; - opacity: 0; - -webkit-transition: opacity 0.2s linear; - } - div.docs:hover .octothorpe { - opacity: 1; - } -div.code { - margin-left: 790px; - padding: 14px 15px 16px 50px; - vertical-align: top; -} - .code pre, .docs p code { - font-size: 12px; - } - pre, tt, code { - line-height: 18px; - font-family: Monaco, Consolas, "Lucida Console", monospace; - margin: 0; padding: 0; - } -div.clearall { - clear: both; -} - - -/*---------------------- Syntax Highlighting -----------------------------*/ -td.linenos { background-color: #f0f0f0; padding-right: 10px; } -span.lineno { background-color: #f0f0f0; padding: 0 5px 0 5px; } -body .hll { background-color: #ffffcc } -body .c { color: #408080; font-style: italic } /* Comment */ -body .err { border: 1px solid #FF0000 } /* Error */ -body .k { color: #954121 } /* Keyword */ -body .o { color: #666666 } /* Operator */ -body .cm { color: #408080; font-style: italic } /* Comment.Multiline */ -body .cp { color: #BC7A00 } /* Comment.Preproc */ -body .c1 { color: #408080; font-style: italic } /* Comment.Single */ -body .cs { color: #408080; font-style: italic } /* Comment.Special */ -body .gd { color: #A00000 } /* Generic.Deleted */ -body .ge { font-style: italic } /* Generic.Emph */ -body .gr { color: #FF0000 } /* Generic.Error */ -body .gh { color: #000080; font-weight: bold } /* Generic.Heading */ -body .gi { color: #00A000 } /* Generic.Inserted */ -body .go { color: #808080 } /* Generic.Output */ -body .gp { color: #000080; font-weight: bold } /* Generic.Prompt */ -body .gs { font-weight: bold } /* Generic.Strong */ -body .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ -body .gt { color: #0040D0 } /* Generic.Traceback */ -body .kc { color: #954121 } /* Keyword.Constant */ -body .kd { color: #954121; font-weight: bold } /* Keyword.Declaration */ -body .kn { color: #954121; font-weight: bold } /* Keyword.Namespace */ -body .kp { color: #954121 } /* Keyword.Pseudo */ -body .kr { color: #954121; font-weight: bold } /* Keyword.Reserved */ -body .kt { color: #B00040 } /* Keyword.Type */ -body .m { color: #666666 } /* Literal.Number */ -body .s { color: #219161 } /* Literal.String */ -body .na { color: #7D9029 } /* Name.Attribute */ -body .nb { color: #954121 } /* Name.Builtin */ -body .nc { color: #0000FF; font-weight: bold } /* Name.Class */ -body .no { color: #880000 } /* Name.Constant */ -body .nd { color: #AA22FF } /* Name.Decorator */ -body .ni { color: #999999; font-weight: bold } /* Name.Entity */ -body .ne { color: #D2413A; font-weight: bold } /* Name.Exception */ -body .nf { color: #0000FF } /* Name.Function */ -body .nl { color: #A0A000 } /* Name.Label */ -body .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ -body .nt { color: #954121; font-weight: bold } /* Name.Tag */ -body .nv { color: #19469D } /* Name.Variable */ -body .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */ -body .w { color: #bbbbbb } /* Text.Whitespace */ -body .mf { color: #666666 } /* Literal.Number.Float */ -body .mh { color: #666666 } /* Literal.Number.Hex */ -body .mi { color: #666666 } /* Literal.Number.Integer */ -body .mo { color: #666666 } /* Literal.Number.Oct */ -body .sb { color: #219161 } /* Literal.String.Backtick */ -body .sc { color: #219161 } /* Literal.String.Char */ -body .sd { color: #219161; font-style: italic } /* Literal.String.Doc */ -body .s2 { color: #219161 } /* Literal.String.Double */ -body .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ -body .sh { color: #219161 } /* Literal.String.Heredoc */ -body .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ -body .sx { color: #954121 } /* Literal.String.Other */ -body .sr { color: #BB6688 } /* Literal.String.Regex */ -body .s1 { color: #219161 } /* Literal.String.Single */ -body .ss { color: #19469D } /* Literal.String.Symbol */ -body .bp { color: #954121 } /* Name.Builtin.Pseudo */ -body .vc { color: #19469D } /* Name.Variable.Class */ -body .vg { color: #19469D } /* Name.Variable.Global */ -body .vi { color: #19469D } /* Name.Variable.Instance */ -body .il { color: #666666 } /* Literal.Number.Integer.Long */