From fa1011c80d03aea68f0f7aded8311e7cfcdc1a6e Mon Sep 17 00:00:00 2001 From: "Jenkins T. Quantopian, III" Date: Sat, 4 Feb 2012 04:23:31 +0000 Subject: [PATCH] reorganized packages, test passing again --- .coverage | Bin 0 -> 5294 bytes jenkins.sh | 12 ++++++------ __init__.py => simulator/__init__.py | 0 {backtest => simulator/backtest}/__init__.py | 0 {backtest => simulator/backtest}/util.py | 0 config.py => simulator/config.py | 0 {data => simulator/data}/__init__.py | 0 {data => simulator/data}/feed.py | 6 +++--- {data => simulator/data}/sources/__init__.py | 0 {data => simulator/data}/sources/equity.py | 4 ++-- simulator/host_settings.py | 14 ++++++++++++++ qbt.py => simulator/qbt.py | 0 qbt_client.py => simulator/qbt_client.py | 0 qbt_server.py => simulator/qbt_server.py | 0 test/test_messaging.py | 8 ++++---- transforms/__init__.py | 0 {data => transforms}/transforms.py | 7 +++---- 17 files changed, 32 insertions(+), 19 deletions(-) create mode 100644 .coverage rename __init__.py => simulator/__init__.py (100%) rename {backtest => simulator/backtest}/__init__.py (100%) rename {backtest => simulator/backtest}/util.py (100%) rename config.py => simulator/config.py (100%) rename {data => simulator/data}/__init__.py (100%) rename {data => simulator/data}/feed.py (97%) rename {data => simulator/data}/sources/__init__.py (100%) rename {data => simulator/data}/sources/equity.py (97%) create mode 100644 simulator/host_settings.py rename qbt.py => simulator/qbt.py (100%) rename qbt_client.py => simulator/qbt_client.py (100%) rename qbt_server.py => simulator/qbt_server.py (100%) create mode 100644 transforms/__init__.py rename {data => transforms}/transforms.py (99%) diff --git a/.coverage b/.coverage new file mode 100644 index 0000000000000000000000000000000000000000..fe3536a97e38b9db8f47f68791d2464b85b68fbd GIT binary patch literal 5294 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 literal 0 HcmV?d00001 diff --git a/jenkins.sh b/jenkins.sh index 4ad1c800..da5245e8 100755 --- a/jenkins.sh +++ b/jenkins.sh @@ -8,16 +8,16 @@ fi export WORKON_HOME=$HOME/.venvs source /usr/local/bin/virtualenvwrapper.sh -#create the scientific python virtualenv and copy to provide qexec base +#create the scientific python virtualenv and copy to provide qsim base mkvirtualenv --no-site-packages scientific_base workon scientific_base ./ordered_pip.sh requirements_sci.txt deactivate -#re-base qexec -#rmvirtualenv qexec -cpvirtualenv scientific_base qexec +#re-base qsim +#rmvirtualenv qsim +cpvirtualenv scientific_base qsim -workon qexec +workon qsim ./ordered_pip.sh requirements.txt ./ordered_pip.sh requirements_dev.txt @@ -25,7 +25,7 @@ workon qexec python dev_setup.py #run all the tests in test -nosetests --with-xcoverage --with-xunit --cover-package=myapp --cover-erase +nosetests --with-xcoverage --with-xunit --cover-erase --cover-inclusive pylint -f parseable . | tee pylint.out deactivate diff --git a/__init__.py b/simulator/__init__.py similarity index 100% rename from __init__.py rename to simulator/__init__.py diff --git a/backtest/__init__.py b/simulator/backtest/__init__.py similarity index 100% rename from backtest/__init__.py rename to simulator/backtest/__init__.py diff --git a/backtest/util.py b/simulator/backtest/util.py similarity index 100% rename from backtest/util.py rename to simulator/backtest/util.py diff --git a/config.py b/simulator/config.py similarity index 100% rename from config.py rename to simulator/config.py diff --git a/data/__init__.py b/simulator/data/__init__.py similarity index 100% rename from data/__init__.py rename to simulator/data/__init__.py diff --git a/data/feed.py b/simulator/data/feed.py similarity index 97% rename from data/feed.py rename to simulator/data/feed.py index e1962dfb..1f84d4ea 100644 --- a/data/feed.py +++ b/simulator/data/feed.py @@ -1,6 +1,6 @@ -from data.sources.equity import * -from backtest.util import * +from simulator.data.sources.equity import * +from simulator.backtest.util import * import time import logging @@ -114,4 +114,4 @@ class DataFeed(object): - \ No newline at end of file + diff --git a/data/sources/__init__.py b/simulator/data/sources/__init__.py similarity index 100% rename from data/sources/__init__.py rename to simulator/data/sources/__init__.py diff --git a/data/sources/equity.py b/simulator/data/sources/equity.py similarity index 97% rename from data/sources/equity.py rename to simulator/data/sources/equity.py index 4923871e..a3ef1d62 100644 --- a/data/sources/equity.py +++ b/simulator/data/sources/equity.py @@ -10,9 +10,9 @@ import logging import random from pymongo import ASCENDING, DESCENDING -from backtest.util import * +from simulator.backtest.util import * -from qbt_server import * #connect_db +from simulator.qbt_server import * #connect_db class DataSource(object): def __init__(self, feed, source_id): diff --git a/simulator/host_settings.py b/simulator/host_settings.py new file mode 100644 index 00000000..23c9efdc --- /dev/null +++ b/simulator/host_settings.py @@ -0,0 +1,14 @@ +class Config(object): + def __init__(self, dct): + self.__dict__.update(dct) + +mongo_conn_args = Config({ + 'mongodb_host' : 'claire.mongohq.com', + 'mongodb_port' : 10087, + 'mongodb_dbname' : 'quantodata-staging', + 'mongodb_user' : 'quantopian', + 'mongodb_password' : 'quantopian', +}) + +root_url = 'http://localhost:8000' +ws_url = 'ws://localhost:8001' diff --git a/qbt.py b/simulator/qbt.py similarity index 100% rename from qbt.py rename to simulator/qbt.py diff --git a/qbt_client.py b/simulator/qbt_client.py similarity index 100% rename from qbt_client.py rename to simulator/qbt_client.py diff --git a/qbt_server.py b/simulator/qbt_server.py similarity index 100% rename from qbt_server.py rename to simulator/qbt_server.py diff --git a/test/test_messaging.py b/test/test_messaging.py index a50c5ecf..056d2e47 100644 --- a/test/test_messaging.py +++ b/test/test_messaging.py @@ -2,11 +2,11 @@ import unittest2 as unittest import zmq import logging import tornado -from data.sources.equity import * -from data.feed import * -from data.transforms import MergedTransformsFeed, MovingAverage +from simulator.data.sources.equity import * +from simulator.data.feed import * +from transforms.transforms import MergedTransformsFeed, MovingAverage -from qbt_client import TestClient +from simulator.qbt_client import TestClient class MessagingTestCase(unittest.TestCase): diff --git a/transforms/__init__.py b/transforms/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/data/transforms.py b/transforms/transforms.py similarity index 99% rename from data/transforms.py rename to transforms/transforms.py index 78e160cf..b578fd16 100644 --- a/data/transforms.py +++ b/transforms/transforms.py @@ -2,11 +2,10 @@ import zmq import logging import datetime import json -import config import copy import multiprocessing -from backtest.util import * - +from simulator.backtest.util import * +import simulator.config as config class Transform(object): """Parent class for feed transforms. Subclass to create a new derived value from the combined feed.""" @@ -223,4 +222,4 @@ class MergedTransformsFeed(Transform): #signal to client that we're done self.result_socket.send("DONE") self.logger.info("Transform {name} received {r} and sent {s}".format(name=self.name, r=self.data_buffer.received_count, s=self.data_buffer.sent_count)) - \ No newline at end of file +