diff --git a/modules/level/level/interface/web.py b/modules/level/level/interface/web.py index 1ea780d..695ef58 100644 --- a/modules/level/level/interface/web.py +++ b/modules/level/level/interface/web.py @@ -17,14 +17,12 @@ class LevelWebInterface(WebInterface): def list(self, request, response, endpoint, values): - response.data = "Hello this is the list function" + self.info = "Testing" return response def list_info(self, request, response, endpoint, values): - response.data = "Info listing: " + values["info"] - return response diff --git a/modules/level/level/view/web/list.mako b/modules/level/level/view/web/list.mako index 1da681d..159116b 100644 --- a/modules/level/level/view/web/list.mako +++ b/modules/level/level/view/web/list.mako @@ -1 +1,4 @@ Some kind of test + +Parameter: ${info} + diff --git a/pipeline/pipeline/foundation/shell/bash.py b/pipeline/pipeline/foundation/shell/bash.py index 727a414..3e7b325 100644 --- a/pipeline/pipeline/foundation/shell/bash.py +++ b/pipeline/pipeline/foundation/shell/bash.py @@ -1,4 +1,4 @@ -from foundation.shell.base import Shell +from pipeline.foundation.shell.base import Shell class Bash(Shell): """ diff --git a/pipeline/pipeline/foundation/shell/tcsh.py b/pipeline/pipeline/foundation/shell/tcsh.py index ba0b282..4cb2ba9 100644 --- a/pipeline/pipeline/foundation/shell/tcsh.py +++ b/pipeline/pipeline/foundation/shell/tcsh.py @@ -1,4 +1,4 @@ -from foundation.shell.base import Shell +from pipeline.foundation.shell.base import Shell class Tcsh(Shell): """ diff --git a/pipeline/pipeline/shell.py b/pipeline/pipeline/shell.py index d01e7fa..3f3a62d 100644 --- a/pipeline/pipeline/shell.py +++ b/pipeline/pipeline/shell.py @@ -1,11 +1,11 @@ import os import re -from foundation.shell.base import EnvVarNotFound +from pipeline.foundation.shell.base import EnvVarNotFound from pipeline import settings _shell_name = os.getenv("SHELL").split(os.sep)[-1] -_shell_module = __import__("foundation.shell." + _shell_name, globals(), locals(), [None]) +_shell_module = __import__("pipeline.foundation.shell." + _shell_name, globals(), locals(), [None]) _Shell = getattr(_shell_module, _shell_name.capitalize()) class Shell(_Shell): diff --git a/pipeline/setup.py b/pipeline/setup.py index 1427ac9..9e439b3 100644 --- a/pipeline/setup.py +++ b/pipeline/setup.py @@ -28,7 +28,7 @@ def package_data(): name = "SlipStream", version = "0.0.1", packages = find_packages(), - install_requires = ['SlipStream-foundation>=0.0.1'], + install_requires = ['SQLAlchemy>=0.4', 'Mako>=0.1.10'], entry_points = { 'console_scripts': [ diff --git a/test_suite/rebuild.tcsh b/test_suite/rebuild.tcsh index b952159..aa565f7 100755 --- a/test_suite/rebuild.tcsh +++ b/test_suite/rebuild.tcsh @@ -1,11 +1,11 @@ #!/bin/tcsh -f -cd ../ -cd foundation +# cd ../ +# cd foundation -python setup.py clean -python setup.py build -python setup.py bdist_egg +# python setup.py clean +# python setup.py build +# python setup.py bdist_egg cd ../pipeline diff --git a/test_suite/setup_clean.tcsh b/test_suite/setup_clean.tcsh index 040c85e..17ee5da 100755 --- a/test_suite/setup_clean.tcsh +++ b/test_suite/setup_clean.tcsh @@ -14,7 +14,7 @@ cp -r /home/mike/projects/pipeline/modular/dependencies /tmp/local # easy_install --prefix local http://www.michaelpjones.co.uk/pipeline/SlipStream-0.0.1-py${pyVer}.egg # easy_install --prefix local http://www.michaelpjones.co.uk/pipeline/SlipStream_level-0.0.1-py${pyVer}.egg -easy_install --prefix local /home/mike/projects/pipeline/modular/foundation/dist/SlipStream_foundation-0.0.1-py${pyVer}.egg +# easy_install --prefix local /home/mike/projects/pipeline/modular/foundation/dist/SlipStream_foundation-0.0.1-py${pyVer}.egg easy_install --prefix local /home/mike/projects/pipeline/modular/pipeline/dist/SlipStream-0.0.1-py${pyVer}.egg easy_install --prefix local /home/mike/projects/pipeline/modular/modules/level/dist/SlipStream_level-0.0.1-py${pyVer}.egg