Add Mercurial URL to README and use README as long_description,

diff --git a/README b/README
index eb56fd05b8385a4a7901cc5103a504ffc64d6885..bf9a32c6b246aec22b24b28e84e0c2f442b61d57 100644 (file)
--- a/README
+++ b/README
@@ -69,9 +69,23 @@ that it does. We aim to make of Hooke a robust tool that can help your
 research.
 
 
+Source
+======
+
+Hooke is available as a Mercurial_ repository::
+
+    $ hg clone http://www.physics.drexel.edu/~wking/code/hg/hooke/
+
+See the docs_ for installation details.
+
+
 Licensing
 =========
 
 Hooke is released under the GNU Lesser General Public License, either
 version 3 of the License (COPYING and COPYING.LESSER), or (at your
 option) any later version.
+
+
+.. _Mercurial: http://mercurial.selenic.com/
+.. _docs: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/Hooke/html/

diff --git a/setup.py b/setup.py
index 33dfb7826079adfc3139de9678269a926f18da51..db66c08ca3fcf869d30e1f329a66f68f097d7149 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -16,11 +16,7 @@
 # License along with Hooke.  If not, see
 # <http://www.gnu.org/licenses/>.
 
-"""Hooke: tools for analyzing force spectroscopy data.
-
-Mercurial repository:
-http://www.physics.drexel.edu/~wking/code/hg/hooke/
-"""
+"Tools for analyzing force spectroscopy data."
 
 from distutils.core import setup
 from os import walk
@@ -52,16 +48,18 @@ def find_packages(root='hooke'):
 
 packages = find_packages()
 
+_this_dir = os.path.dirname(__file__)
+
 setup(name="Hooke",
       version=version(),
       maintainer="Massimo Sandal",
       maintainer_email="hookesoftware@googlegroups.com",
       url="http://code.google.com/p/hooke/",
-      download_url="http://www.physics.drexel.edu/~wking/code/hg/hgwebdir.gci/hooke/archive/%s.tar.gz" % version(3),
+      download_url="http://www.physics.drexel.edu/~wking/code/hg/hgweb.cgi/hooke/archive/%s.tar.gz" % version(3),
       license = "GNU Lesser General Public License (LGPL)",
       platforms = ["all"],
-      description = doclines[0],
-      long_description = "\n".join(doclines[2:]),
+      description = __doc__,
+      long_description=open(os.path.join(_this_dir, 'README'), 'r').read(),
       classifiers = filter(None, classifiers.split("\n")),
       scripts = ['bin/hk.py'],
       packages = packages,