Changeset 94:55ce6ff2bd47 in livinglogic.python.nightshade for setup.py

Show
Ignore:
Timestamp:
01/14/09 11:38:58 (10 years ago)
Author:
Walter Doerwald <walter@…>
Parents:
93:5fe90eea3911 (diff), 91:2ee8d87ade98 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Branch:
default
Tags:
rel-0-14
Message:

Merge.

Files:
2 modified

Legend:

Unmodified
Added
Removed
  • setup.py

    r91 r94  
    6060args = dict( 
    6161    name="ll-nightshade", 
    62     version="0.13.1", 
     62    version="0.14", 
    6363    description="Serve the output of Oracle functions/procedures with CherryPy", 
    6464    long_description=descr, 
  • setup.py

    r92 r94  
    99except ImportError: 
    1010    from distutils import core as tools 
     11 
     12import re 
    1113 
    1214 
     
    5052    news = news[underlines[0]-1:underlines[1]-1] 
    5153    news = "".join(news) 
    52     description = "%s\n\n\n%s" % (DESCRIPTION.strip(), news) 
     54    descr = "%s\n\n\n%s" % (DESCRIPTION.strip(), news) 
     55 
     56    # Get rid of text roles PyPI doesn't know about 
     57    descr = re.subn(":[a-z]+:`([a-zA-Z0-9_.]+)`", "``\\1``", descr)[0] 
    5358 
    5459 
     
    5762    version="0.14", 
    5863    description="Serve the output of Oracle functions/procedures with CherryPy", 
    59     long_description=description, 
     64    long_description=descr, 
    6065    author=u"Walter Doerwald", 
    6166    author_email="walter@livinglogic.de",