moksha/__init__.py | 3 ++-
setup.py | 4 ++--
start-moksha | 14 ++++++++------
3 files changed, 12 insertions(+), 9 deletions(-)
New commits:
commit 759697609564acdefe2d4b019d735923ae1ce756
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Jun 4 16:19:48 2010 -0400
Get our virtualenv setup working again! w00t.
diff --git a/setup.py b/setup.py
index 9deaaa1..5ff80cd 100644
--- a/setup.py
+++ b/setup.py
@@ -26,12 +26,12 @@ setup(
url='http://moksha.fedorahosted.org',
install_requires=[
"TurboGears2",
- "ToscaWidgets >= 0.9.1",
+ "ToscaWidgets>=0.9.9",
"zope.sqlalchemy",
#"Shove",
"feedcache",
"feedparser",
- "tw.jquery",
+ "tw.jquery>=0.9.9",
"orbited",
#"Twisted",
"stomper",
diff --git a/start-moksha b/start-moksha
index 73e6345..e6a07e2 100755
--- a/start-moksha
+++ b/start-moksha
@@ -9,10 +9,12 @@ if [ ! $VIRTUAL_ENV ]; then
#fi
#python tg2-bootstrap.py --no-site-packages tg2env
- virtualenv --no-site-packages tg2env
+ virtualenv --distribute --no-site-packages tg2env
source tg2env/bin/activate
#easy_install -i
http://www.turbogears.org/2.1/downloads/current/index
tg.devtools
+ # HACK:
http://groups.google.com/group/turbogears/browse_thread/thread/0176623b98...
+ easy_install Extremes
easy_install -i
http://www.turbogears.org/2.0/downloads/current/index
tg.devtools
# Hack around Shove's hard SQLAlchemy requirement :(
@@ -21,19 +23,19 @@ if [ ! $VIRTUAL_ENV ]; then
easy_install -U SQLAlchemy
easy_install Paver
easy_install Twisted
- easy_install pysqlite
+ #easy_install pysqlite
easy_install -U ToscaWidgets
easy_install "tw.jquery>=0.9.9"
- easy_install -U SQLAlchemy
- easy_install -U FormEncode
- easy_install -U Beaker
+ #easy_install -U SQLAlchemy
+ #easy_install -U FormEncode
+ #easy_install -U Beaker
# `install` instead of `develop` to avoid weird directory vs. egg
# namespace issues
- #echo "Installing Moksha"
echo "Installing Moksha"
#rm -fr dist
python setup.py install
+
#python setup.py bdist_egg
#easy_install -Z dist/*.egg
commit de0910f42270192fc6b46879c872c4555d77326a
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Jun 4 16:09:54 2010 -0400
Make our moksha.get_widget method more robust.
(Before this, it would cause `paster tginfo` to traceback)
diff --git a/moksha/__init__.py b/moksha/__init__.py
index c0c1d82..91ec102 100644
--- a/moksha/__init__.py
+++ b/moksha/__init__.py
@@ -41,7 +41,8 @@ livewidgets = StackedObjectProxy(name="livewidgets")
def get_widget(name):
""" Get a widget instance by name """
- return _widgets[name]['widget']
+ if _widgets:
+ return _widgets[name]['widget']
def get_app(name):
""" Get an app controller by name """