Skip to content
Permalink
Browse files

Release v1.2.1

Conflicts:
	README.rst
	docs/conf.py
  • Loading branch information
jodal committed Jul 20, 2015
2 parents a850782 + 61de415 commit 9c05f32bd98d4ea1fbf7bcd65d7ae8e628322c2c
@@ -0,0 +1,5 @@
[report]
omit =
*/pyshared/*
*/python?.?/*
*/site-packages/nose/*
@@ -1,3 +1,4 @@
*.egg-info
*.py,cover
*.pyc
*.swp
@@ -1,15 +1,28 @@
sudo: false

language: python

addons:
apt:
packages:
- libev-dev

env:
- TOX_ENV=py26
- TOX_ENV=py27
- TOX_ENV=py32
- TOX_ENV=py33
- TOX_ENV=py34
- TOX_ENV=pypy
- TOX_ENV=pypy3
- TOX_ENV=docs
- TOX_ENV=flake8

install:
- "sudo apt-get install -qq libev-dev"
- "pip install tox"

script:
- "tox -e $TOX_ENV"

after_success:
- "if [ $TOX_ENV == 'py27' ]; then pip install coveralls; coveralls; fi"
@@ -1,5 +1,14 @@
include LICENSE *.rst pylintrc setup.cfg tox.ini
include *.rst
include .coveragerc
include .travis.yml
include LICENSE
include pylintrc
include setup.cfg
include tox.ini

recursive-include docs *
prune docs/_build

recursive-include examples *.py

recursive-include tests *.py
@@ -365,7 +365,7 @@ To install the latest development snapshot::
License
=======

Pykka is copyright 2010-2014 Stein Magnus Jodal and contributors.
Pykka is copyright 2010-2015 Stein Magnus Jodal and contributors.
Pykka is licensed under the `Apache License, Version 2.0
<http://www.apache.org/licenses/LICENSE-2.0>`_.

@@ -0,0 +1,25 @@
# Build documentation
sphinx

# Check code style, error, etc
flake8
flake8-import-order

# Mock dependencies in tests
mock

# Test runners
nose
tox

# Measure test's code coverage
coverage

# Check that MANIFEST.in matches Git repo contents before making a release
check-manifest

# To make wheel packages
wheel

# Securely upload packages to PyPI
twine
@@ -2,6 +2,19 @@
Changes
=======

v1.2.1 (2015-07-20)
===================

- Increase log level of :func:`pykka.debug.log_thread_tracebacks` debugging
helper from :attr:`logging.INFO` to :attr:`logging.CRITICAL`.

- Fix errors in docs examples. (PR: :issue:`29`, :issue:`43`)

- Fix typos in docs.

- Various project setup and development improvements.


v1.2.0 (2013-07-15)
===================

@@ -15,6 +15,7 @@


class Mock(object):

def __init__(self, *args, **kwargs):
pass

@@ -50,6 +51,7 @@ def __getattr__(self, name):
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.extlinks',
'sphinx.ext.intersphinx',
'sphinx.ext.viewcode',
]

@@ -58,7 +60,7 @@ def __getattr__(self, name):
master_doc = 'index'

project = u'Pykka'
copyright = u'2010-2014, Stein Magnus Jodal'
copyright = u'2010-2015, Stein Magnus Jodal'


def get_version():
@@ -118,3 +120,10 @@ def get_version():
extlinks = {
'issue': ('https://github.com/jodal/pykka/issues/%s', '#'),
}


# -- Options for intersphinx extension ----------------------------------------

intersphinx_mapping = {
'python': ('http://docs.python.org/2', None),
}
@@ -4,12 +4,14 @@


class Adder(pykka.ThreadingActor):

def add_one(self, i):
print('{} is increasing {}'.format(self, i))
return i + 1


class Bookkeeper(pykka.ThreadingActor):

def __init__(self, adder):
super(Bookkeeper, self).__init__()
self.adder = adder
@@ -10,12 +10,14 @@


class DeadlockActorA(pykka.ThreadingActor):

def foo(self, b):
logging.debug('This is foo calling bar')
return b.bar().get()


class DeadlockActorB(pykka.ThreadingActor):

def __init__(self, a):
super(DeadlockActorB, self).__init__()
self.a = a
@@ -4,6 +4,7 @@


class PlainActor(pykka.ThreadingActor):

def __init__(self):
super(PlainActor, self).__init__()
self.stored_messages = []
@@ -22,6 +22,7 @@


class Resolver(pykka.ThreadingActor):

def resolve(self, ip):
try:
info = socket.gethostbyaddr(ip)
@@ -1,10 +1,10 @@
#! /usr/bin/env python

import pykka

import threading
import time

import pykka


class AnActor(pykka.ThreadingActor):
field = 'this is the value of AnActor.field'
@@ -1,13 +1,27 @@
# flake8: noqa
from pykka.actor import Actor, ActorRef, ThreadingActor
from pykka.actor import Actor, ActorRef
from pykka.exceptions import ActorDeadError, Timeout
from pykka.future import Future, get_all, ThreadingFuture
from pykka.future import Future, get_all
from pykka.proxy import ActorProxy
from pykka.registry import ActorRegistry
from pykka.threading import ThreadingActor, ThreadingFuture


#: Pykka's :pep:`386` and :pep:`396` compatible version number
__version__ = '1.2.0'
__all__ = [
'Actor',
'ActorDeadError',
'ActorProxy',
'ActorRef',
'ActorRegistry',
'Future',
'ThreadingActor',
'ThreadingFuture',
'Timeout',
'get_all',
]


#: Pykka's :pep:`396` and :pep:`440` compatible version number
__version__ = '1.2.1'


def _add_null_handler_for_logging():
@@ -16,6 +30,7 @@ def _add_null_handler_for_logging():
NullHandler = logging.NullHandler # Python 2.7 and upwards
except AttributeError:
class NullHandler(logging.Handler):

def emit(self, record):
pass
logging.getLogger('pykka').addHandler(NullHandler())

0 comments on commit 9c05f32

Please sign in to comment.
You can’t perform that action at this time.