[Lxml-checkins] r46438 - lxml/trunk

[scoder at codespeak.net]

Author: scoder
Date: Mon Sep 10 14:20:57 2007
New Revision: 46438

Modified:
   lxml/trunk/setup.py
   lxml/trunk/versioninfo.py
Log:
drop branch link in pre-releases

Modified: lxml/trunk/setup.py
==============================================================================
--- lxml/trunk/setup.py	(original)
+++ lxml/trunk/setup.py	Mon Sep 10 14:20:57 2007
@@ -41,6 +41,19 @@
 print "Building lxml version", svn_version
 
 
+branch_link = """
+After an official release of a new stable series, current bug fixes become
+available at http://codespeak.net/svn/lxml/branch/lxml-%(branch_version)s .
+Running ``easy_install lxml==%(branch_version)sbugfix`` will install this
+version from
+http://codespeak.net/svn/lxml/branch/lxml-%(branch_version)s#egg=lxml-%(branch_version)sbugfix
+
+"""
+
+if versioninfo.is_pre_release():
+    branch_link = ""
+
+
 extra_options.update(setupinfo.extra_setup_args())
 
 setup(
@@ -55,7 +68,7 @@
 
     description="Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API.",
 
-    long_description=(("""\
+    long_description=((("""\
 lxml is a Pythonic, mature binding for the libxml2 and libxslt libraries.  It
 provides safe and convenient access to these libraries using the ElementTree
 API.
@@ -71,13 +84,7 @@
 Running ``easy_install lxml==dev`` will install it from
 http://codespeak.net/svn/lxml/trunk#egg=lxml-dev
 
-After an official release of a new stable series, current bug fixes might
-become available at
-http://codespeak.net/svn/lxml/branch/lxml-%(branch_version)s .  Running
-``easy_install lxml==%(branch_version)sbugfix`` will install this version from
-http://codespeak.net/svn/lxml/branch/lxml-%(branch_version)s#egg=lxml-%(branch_version)sbugfix
-
-""" % { "branch_version" : versioninfo.branch_version() }) +
+""" + branch_link) % { "branch_version" : versioninfo.branch_version() }) +
                       versioninfo.changes()),
     classifiers = [
     versioninfo.dev_status(),

Modified: lxml/trunk/versioninfo.py
==============================================================================
--- lxml/trunk/versioninfo.py	(original)
+++ lxml/trunk/versioninfo.py	Mon Sep 10 14:20:57 2007
@@ -11,6 +11,10 @@
 def branch_version():
     return version()[:3]
 
+def is_pre_release():
+    version_string = version()
+    return "dev" in version_string or "alpha" in version_string or "beta" in version_string
+
 def svn_version():
     _version = version()
     src_dir = get_src_dir()