Skip to content

Commit

Permalink
Merge branch 'master' into 0.8
Browse files Browse the repository at this point in the history
  • Loading branch information
lsbardel committed Jun 23, 2014
2 parents 675a32a + f6012a5 commit 0a83c7c
Show file tree
Hide file tree
Showing 28 changed files with 203 additions and 582 deletions.
6 changes: 5 additions & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,22 @@ omit =
*pulsar/utils/system/winservice.py
*pulsar/utils/system/windowssystem.py
*pulsar/utils/system/winprocess.py
*pulsar/utils/system/appengine.py
*pulsar/async/cov.py
*pulsar/async/fallbacks/asyncio.py
*pulsar/async/appengine.py
*pulsar/apps/test/plugins/bench.py
*pulsar/apps/test/cov.py
*pulsar/apps/test/plugins/profile.py
*pulsar/apps/test/pep.py
*pulsar/apps/data/stores/*
examples/httpbin/config.py
examples/philosophers/config.py
examples/webmail/*
examples/taskqueue/winservice.py
examples/pshell/*
examples/snippets/*
examples/pulsards/*
examples/tweets/*



Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
script:
- python -m covrun --pep8 pulsar examples tests
- sudo rm -rf pulsar
- python -m covrun -w 2 -e taskqueue pshell philosophers webmail djangoapp stores.odm stores.couchdb stores.query stores.redis
- python -m covrun -w 2 -e taskqueue pshell philosophers webmail stores.odm stores.couchdb stores.query stores.redis
- if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then python -m runtests --coveralls; fi

notifications:
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
Ver. 0.8.3 - 2014-Jun-23
===========================
* Fixed critical bug in python 2 for :func:`.middleware_in_executor`
* Set trollius logger to warning by default (same as asyncio)
* Added :meth:`.WsgiRequest.redirect` and :meth:`.Router.redirect` methods
to simplify redirection.
* Renamed css container as :class:`.Links`

Ver. 0.8.2 - 2014-May-30
===========================
* :ref:`--pep8 <setting-pep8>` is a new command line option for the
Expand Down
8 changes: 2 additions & 6 deletions examples/djangoapp/tests/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ def setUpClass(cls):
cls.exc_id = gen_unique_id()[:8]
name = cls.__name__.lower()
argv = [__file__, 'pulse',
'--bind', '127.0.0.1:0',
'-b', '127.0.0.1:0',
'--concurrency', cls.concurrency,
'--exc-id', cls.exc_id,
'--pulse-app-name', name,
'--data-store', cls.data_store()]
'--data-store', 'pulsar://127.0.0.1:6410/1']
cls.app_cfg = yield send('arbiter', 'run', start_server, name, argv)
assert cls.app_cfg.exc_id == cls.exc_id, "Bad execution id"
addr = cls.app_cfg.addresses[0]
Expand All @@ -59,10 +59,6 @@ def tearDownClass(cls):
if cls.app_cfg:
return send('arbiter', 'kill_actor', cls.app_cfg.name)

@classmethod
def data_store(cls):
return 'pulsar://127.0.0.1:0/8'

def test_home(self):
result = yield self.http.get(self.uri)
self.assertEqual(result.status_code, 200)
Expand Down
2 changes: 1 addition & 1 deletion pulsar/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -
'''Event driven concurrent framework for Python'''
VERSION = (0, 8, 2, 'final', 0)
VERSION = (0, 8, 3, 'final', 0)

import os

Expand Down
1 change: 0 additions & 1 deletion pulsar/apps/wsgi/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ def hello(environ, start_response):

from .html import *
from .content import *
from .templates import *
from .utils import *
from .middleware import *
from .response import *
Expand Down
Loading

0 comments on commit 0a83c7c

Please sign in to comment.