MANIFEST.in | 1 moksha.spec | 30 ++++++++++++++++++++++--- moksha/apps/demo/MokshaJQPlotDemo/run_tests.py | 11 +++++++++ moksha/hub/hub.py | 7 +++++ setup.py | 2 - 5 files changed, 46 insertions(+), 5 deletions(-)
New commits: commit 8ec1f9df219a35d6fc29fd004cb37c04245bf49f Author: Luke Macken lmacken@redhat.com Date: Fri Aug 19 14:38:03 2011 -0400
getting ready for 0.6.0
diff --git a/moksha.spec b/moksha.spec index 9c5c69c..7802435 100644 --- a/moksha.spec +++ b/moksha.spec @@ -2,7 +2,7 @@ %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
Name: moksha -Version: 0.5.0 +Version: 0.6.0 Release: 1%{?dist} Summary: A platform for creating real-time web applications Group: Applications/Internet @@ -34,6 +34,18 @@ BuildRequires: python-bunch BuildRequires: TurboGears2 BuildRequires: python-daemon
+BuildRequires: pyOpenSSL +BuildRequires: python-babel +BuildRequires: orbited +BuildRequires: python-repoze-who-testutil + +%if 0%{?el5} +BuildRequires: python-sqlite2 +BuildRequires: python-hashlib +Requires: python-sqlite2 +Requires: python-hashlib +%endif + Requires: TurboGears2 Requires: python-toscawidgets >= 0.9.1 Requires: python-zope-sqlalchemy @@ -53,6 +65,10 @@ Requires: python-twisted Requires: python-stomper Requires: python-daemon
+Requires: pyOpenSSL +Requires: python-babel + + %description Moksha is a platform for creating real-time collaborative web applications. It provides a set of Python and JavaScript API's that make it simple to create @@ -87,7 +103,7 @@ This package contains an Apache mod_wsgi configuration for Moksha.
%{__sed} -i -e 's/$VERSION/%{version}/g' docs/conf.py make -C docs html -%{__rm} docs/_build/html/.buildinfo +#%{__rm} docs/_build/html/.buildinfo
%install %{__rm} -rf %{buildroot} @@ -130,7 +146,7 @@ make -C docs html %check PYTHONPATH=$(pwd) python run_tests.py pushd moksha/apps/demo/MokshaJQPlotDemo/ -PYTHONPATH=$(pwd) python run_tests.py +PYTHONPATH=$(pwd):../../../../ python run_tests.py popd
# Remove the tests @@ -189,6 +205,11 @@ fi %doc docs/_build/html
%changelog +* Fri Aug 19 2011 Luke Macken lmacken@redhat.com - 0.6.0-1 +- 0.6.0 release +- Update our dependencies to finally get the test suite running +- Improve how we run our unit tests, to get them working on RHEL5 + * Wed Dec 15 2010 Luke Macken lmacken@redhat.com - 0.5.0-4 - Add a logrotate configuration
diff --git a/setup.py b/setup.py index 63fb211..ce5631c 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ from setuptools import setup, find_packages
setup( name='moksha', - version='0.5.0', + version='0.6.0', description='', author='', author_email='',
commit 801e21161783330b4fef3ad1eed0d287cd682e22 Author: Luke Macken lmacken@redhat.com Date: Fri Aug 19 13:58:48 2011 -0400
Apparently Twisted 8.2.0 on RHEL5 doesn't have the ReactorNotRunning exception
diff --git a/moksha/hub/hub.py b/moksha/hub/hub.py index 219abc1..7e3c072 100644 --- a/moksha/hub/hub.py +++ b/moksha/hub/hub.py @@ -32,7 +32,12 @@ from moksha.hub.reactor import reactor from tg import config from orbited import json from paste.deploy import appconfig -from twisted.internet.error import ReactorNotRunning + +try: + from twisted.internet.error import ReactorNotRunning +except ImportError: # Twisted 8.2.0 on RHEL5 + class ReactorNotRunning(object): + pass
from moksha.lib.helpers import trace, defaultdict, get_moksha_config_path, get_moksha_appconfig from moksha.hub.amqp import AMQPHub
commit 50e7e99fc122060d37909c5252dd43f4f7edea79 Author: Luke Macken lmacken@redhat.com Date: Fri Aug 19 13:48:52 2011 -0400
More test runner updates
diff --git a/MANIFEST.in b/MANIFEST.in index 67d78f0..c0a566e 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,6 +4,7 @@ include moksha.spec stop-moksha start-moksha orbited.cfg include LICENSE README AUTHORS COPYING include development.ini test.ini include setup.py pavement.py +include run_tests.py
graft moksha graft docs diff --git a/moksha.spec b/moksha.spec index 19fa1f7..9c5c69c 100644 --- a/moksha.spec +++ b/moksha.spec @@ -128,7 +128,10 @@ make -C docs html
%check -PYTHONPATH=$(pwd) paver test +PYTHONPATH=$(pwd) python run_tests.py +pushd moksha/apps/demo/MokshaJQPlotDemo/ +PYTHONPATH=$(pwd) python run_tests.py +popd
# Remove the tests %{__rm} -r %{buildroot}%{python_sitelib}/%{name}/tests
commit ef1fa03d753f5d8a0b32831320a1b3e076ace363 Author: Luke Macken lmacken@redhat.com Date: Fri Aug 19 13:46:30 2011 -0400
Add a test runner for our jqplot demo too
diff --git a/moksha/apps/demo/MokshaJQPlotDemo/run_tests.py b/moksha/apps/demo/MokshaJQPlotDemo/run_tests.py new file mode 100755 index 0000000..ebeefd5 --- /dev/null +++ b/moksha/apps/demo/MokshaJQPlotDemo/run_tests.py @@ -0,0 +1,11 @@ +#!/usr/bin/env python +""" +nose runner script. +""" +__requires__ = 'moksha' + +import pkg_resources +import nose + +if __name__ == '__main__': + nose.main()
moksha-commits@lists.fedorahosted.org