Centralised place for __version__, etc. Made importing in Py3K possible.

Author: gak

.gitignore

@@ -2,6 +2,8 @@ docs/_build/
 build/
 .cache/
 .coverage
+dist/
+*.egg-info
 
 *.pyc
 *.png

.travis.yml

@@ -16,7 +16,6 @@ before_install:
  - sudo apt-get install -qq graphviz
 
 install:
- - "echo Python $TRAVIS_PYTHON_VERSION"
  - "pip install -r requirements/development.txt --use-mirrors"
  - "if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then 2to3 -wn pycallgraph; 2to3 -wn test; fi"
 

COPYING LICENSE

@@ -17,6 +17,7 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, os.path.abspath('..'))
+import pycallgraph
 
 # -- General configuration -----------------------------------------------------
 
@@ -48,9 +49,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.0.0'
+version = pycallgraph.__version__
 # The full version, including alpha/beta/rc tags.
-release = '1.0.0'
+release = pycallgraph.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/conf.py

@@ -4,9 +4,15 @@
 
 See http://pycallgraph.slowchop.com/ for more information.
 '''
+from .metadata import __version__
+from .metadata import __copyright__
+from .metadata import __license__
+from .metadata import __author__
+from .metadata import __email__
+from .metadata import __url__
+from .metadata import __credits__
 
 from .pycallgraph import PyCallGraph
-
 from .config import Config
 from .globbing_filter import GlobbingFilter
 

pycallgraph/__init__.py

@@ -1,8 +1,11 @@
+# A different file to pycallgraph.py because of circular import problem
+
 __version__ = '1.0.0'
 __copyright__ = 'Copyright Gerald Kaszuba 2007-2013'
 __license__ = 'GPLv2'
 __author__ = 'Gerald Kaszuba'
 __email__ = '[email protected]'
+__url__ = 'http://pycallgraph.slowchop.com/'
 __credits__ = [
     'Gerald Kaszuba',
 ]

pycallgraph/metadata.py

@@ -1,4 +1,7 @@
-import cPickle as pickle
+try:
+    import cPickle as pickle
+except ImportError:
+    import pickle
 
 from .output import Output
 

pycallgraph/output/pickle.py

@@ -1,4 +1,8 @@
-import xmlrpclib
+try:
+    from xmlrpclib import Server
+except ImportError:
+    from xmlrpc.client import Server
+
 
 from ..exceptions import PyCallGraphException
 from .output import Output
@@ -10,7 +14,7 @@ def __init__(self):
         self.server_url = 'http://127.0.0.1:20738/RPC2'
 
     def start(self):
-        server = xmlrpclib.Server(self.server_url)
+        server = Server(self.server_url)
         self.graph = server.ubigraph
 
         # Create a graph

pycallgraph/output/ubigraph.py

@@ -8,7 +8,10 @@
 from distutils import sysconfig
 from collections import defaultdict
 from threading import Thread
-from Queue import Queue, Empty
+try:
+    from Queue import Queue, Empty
+except ImportError:
+    from queue import Queue, Empty
 
 from .globbing_filter import GlobbingFilter
 

pycallgraph/tracer.py

@@ -3,8 +3,7 @@
 from os import path
 from setuptools import setup
 
-# TODO: Have the version in only one place
-__version__ = '1.0.0'
+import pycallgraph as pycg
 
 # Only install the man page if the correct directory exists
 # XXX: Commented because easy_install doesn't like it
@@ -18,12 +17,13 @@
 
 setup(
     name='pycallgraph',
-    version=__version__,
-    description='Python Call Graph uses GraphViz to generate call graphs ' \
-        'from one execution of your Python code.',
-    author='Gerald Kaszuba',
-    author_email='[email protected]',
-    url='http://pycallgraph.slowchop.com/',
+    version=pycg.__version__,
+    description=pycg.__doc__.strip().replace('\n', ' '),
+    long_description=open('README.md').read(),
+    author=pycg.__author__,
+    author_email=pycg.__email__,
+    license=open('LICENSE').read(),
+    url=pycg.__url__,
     packages=['pycallgraph', 'pycallgraph.output'],
     scripts=['scripts/pycallgraph'],
     data_files=data_files,
@@ -32,7 +32,7 @@
     # TODO: Update download_url
     download_url =
     'http://pycallgraph.slowchop.com/files/download/pycallgraph-%s.tar.gz' % \
-        __version__,
+        pycg.__version__,
 
     classifiers = [
         'Development Status :: 4 - Beta',
@@ -41,7 +41,9 @@
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Software Development :: Testing',
         'Topic :: Software Development :: Debuggers',