Skip to content
Browse files

Merge

  • Loading branch information...
2 parents f825408 + 684f79a commit 9c54574afacbad682d1f5d5bb2bcd0720cf56b4b @bos committed Jun 13, 2012
Showing with 22 additions and 7 deletions.
  1. +11 −0 AUTHORS
  2. 0 COPYING → LICENSE
  3. +0 −4 MANIFEST
  4. +5 −0 MANIFEST.in
  5. +6 −3 setup.py
View
11 AUTHORS
@@ -0,0 +1,11 @@
+statprof was originally written by Andy Wingo, and later ported to modern
+Python by Alex Frazer. It's now maintained by Bryan O'Sullivan.
+
+And here is an list of people who have submitted patches, reported bugs, and
+generally made statprof that much better:
+
+ * Alex Fraser <alex at phatcore dot com>
+ * Andy Wingo <wingo at pobox dot com>
+ * Bryan O'Sullivan <bos@serpentine.com>
+ * Rob Browning <rlb at defaultvalue dot org>
+ * Timothée Peignier <tim at tryphon dot org>
View
0 COPYING → LICENSE
File renamed without changes.
View
4 MANIFEST
@@ -1,4 +0,0 @@
-COPYING
-README.md
-setup.py
-statprof.py
View
5 MANIFEST.in
@@ -0,0 +1,5 @@
+LICENSE
+AUTHORS
+README.rst
+setup.py
+statprof.py
View
9 setup.py
@@ -1,8 +1,11 @@
#!/usr/bin/env python
-import sys
+import os, sys
from setuptools import setup
+def read(fname):
+ return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
extra = {}
if sys.version_info >= (3,):
extra['use_2to3'] = True
@@ -13,11 +16,11 @@
author="Bryan O'Sullivan",
author_email="bos@serpentine.com",
description="Statistical profiling for Python",
- license="LGPL",
+ license=read('LICENSE'),
keywords="profiling",
url="http://packages.python.org/statprof",
py_modules=['statprof'],
- long_description=open('README.rst').read(),
+ long_description=read('README.rst'),
classifiers=[
"Development Status :: 3 - Alpha",
"Topic :: Utilities",

0 comments on commit 9c54574

Please sign in to comment.
Something went wrong with that request. Please try again.