Merge branch 'master' into develop

MANIFEST.in

@@ -3,3 +3,6 @@ include README.rst
 
 graft pyrasite
 graft tests
+graft docs
+
+global-exclude *.pyc *.pyo *.swp *.swo

pkgs/fedora/pyrasite.spec

-%global betaver beta6
+%global betaver beta8
 
 Name:             pyrasite
 Version:          2.0

pyrasite/__init__.py

-__version__ = '2.0beta6'
+__version__ = '2.0beta8'
 __all__ = ('inject', 'inspect', 'PyrasiteIPC',
            'ReverseConnection', 'ReversePythonConnection')
 __license__ = """\

pyrasite/ipc.py

@@ -99,9 +99,8 @@ class PyrasiteIPC(object):
         """Write out a reverse python connection payload with a custom port"""
         (fd, filename) = tempfile.mkstemp()
         tmp = os.fdopen(fd, 'w')
-        path = dirname(abspath(join(pyrasite.__file__, '..')))
-        payload = open(join(path, 'pyrasite', 'reverse.py'))
-        tmp.write('import sys; sys.path.insert(0, "%s")\n' % path)
+        path = dirname(abspath(pyrasite.__file__))
+        payload = open(join(path, 'reverse.py'))
 
         for line in payload.readlines():
             if line.startswith('#'):

setup.py

 from setuptools import setup, find_packages
 
-version = '2.0beta6'
+version = '2.0beta8'
 
 f = open('README.rst')
 long_description = f.read().split('split here')[1]