Changeset 210:efce03513e48 in livinglogic.python.orasql

Show
Ignore:
Timestamp:
01/07/08 16:42:57 (12 years ago)
Author:
Walter Doerwald <walter@…>
Branch:
default
Message:

Add ReST version of the documentation.

Files:
2 added
5 modified
1 moved

Legend:

Unmodified
Added
Removed
  • INSTALL.xml

    r209 r210  
    33<p>To use this module you need the following software packages:</p> 
    44<ol> 
    5 <li><a href="http://www.python.org/">Python 2.4</a>;</li> 
    6 <li><pyref module="ll">ll-core</pyref> (at least 1.3);</li> 
    7 <li><a href="http://www.computronix.com/utilities.shtml#Oracle"><app>cx_Oracle</app></a> 
    8 (at least version 4.1).</li> 
     5<li><a href="http://www.python.org/">Python 2.5</a>;</li> 
     6<li><pyref module="ll">ll-core</pyref> (at least 1.11);</li> 
     7<li><a href="http://www.python.net/crew/atuining/cx_Oracle/"><app>cx_Oracle</app></a> 
     8(at least version 4.3).</li> 
    99</ol> 
    1010</section> 
  • MANIFEST.in

    r24 r210  
    1 include README 
    2 include NEWS 
     1include README.rst 
     2include NEWS.rst 
    33include NEWS.xml 
    4 include INSTALL 
     4include INSTALL.rst 
    55include INSTALL.xml 
    66include Makefile 
  • Makefile

    r198 r210  
    1717 
    1818 
    19 text: 
    20     python$(PYVERSION) `which doc2txt.py` --title "History" NEWS.xml NEWS 
    21     python$(PYVERSION) `which doc2txt.py` --title "Requirements and installation" INSTALL.xml INSTALL 
    22  
    23  
    24 dist: text 
     19dist: 
    2520    rm -rf dist/* 
    2621    python$(PYVERSION) setup.py sdist --formats=bztar,gztar 
     
    3429 
    3530 
    36 livinglogic: text 
     31livinglogic: 
    3732    rm -rf dist/* 
    3833    python$(PYVERSION) setup.py sdist --formats=bztar,gztar 
     
    4237 
    4338 
    44 upload: text 
     39upload: 
    4540    python$(PYVERSION) setup.py sdist --formats=bztar,gztar upload 
    4641    python$(PYVERSION) setup.py sdist --formats=zip upload 
     
    4843 
    4944 
    50 wintext: 
    51     #python$(PYVERSION) C:\\\\Programme\\\\Python25\\\\Scripts\\\\doc2txt.py --title "History" NEWS.xml NEWS 
    52     #python$(PYVERSION) C:\\\\Programme\\\\Python25\\\\Scripts\\\\doc2txt.py --title "Requirements and installation" INSTALL.xml INSTALL 
    53  
    54  
    55 windist: wintext 
     45windist: 
    5646    rm -rf dist/* 
    5747    python$(PYVERSION) setup.py bdist --formats=wininst 
     
    5949 
    6050 
    61 winupload: wintext 
     51winupload: 
    6252    python$(PYVERSION) setup.py bdist --formats=wininst upload 
    6353 
    6454 
    65 winlivinglogic: wintext 
     55winlivinglogic: 
    6656    python$(PYVERSION) setup.py bdist --formats=wininst 
    6757    cd dist && python$(PYVERSION) -mll.scripts.ucp -v -uintranet -gintranet *.exe ssh://intranet@intranet.livinglogic.de/~/documentroot/intranet.livinglogic.de/python-downloads/ 
  • NEWS.xml

    r208 r210  
     1<section><h>Changes in 1.18 (released 01/07/2008)</h> 
     2<ul> 
     3<li>Updated the docstrings to &xist; 3.0.</li> 
     4<li>Added ReST version of the documentation.</li> 
     5</ul> 
     6</section> 
     7 
     8 
    19<section><h>Changes in 1.17.5 (released 08/09/2007)</h> 
    210<ul> 
     
    148156<li>All other subclasses of <class>Definition</class> have been renamed 
    149157to remove the <z>Definition</z> for the name to reduce typing. (Methods 
    150 have been renamed accordingly too.</li> 
     158have been renamed accordingly too.)</li> 
    151159 
    152160<li><func>oramerge.main</func> and <func>oradiff.main</func> 
  • README.rst

    r117 r210  
    11ll-orasql 
     2========= 
    23 
    3 Utilities for working with cx_Oracle. 
     4Utilities for working with cx_Oracle__. 
     5 
     6__ http://www.python.net/crew/atuining/cx_Oracle/ 
    47 
    58For documentation read the source. 
    69 
    7 For requirements and installation instructions read INSTALL. 
     10For requirements and installation instructions read ``INSTALL.rst``. 
    811 
    9 For a list of new features and bugfixes read NEWS. 
     12For a list of new features and bugfixes read ``NEWS.rst``. 
    1013 
    11 For the license read orasql.py. 
     14For the license read ``orasql.py``. 
    1215 
    1316ll-orasql is available from ftp://ftp.livinglogic.de/pub/livinglogic/orasql/ 
  • setup.py

    r205 r210  
    3838""" 
    3939 
    40 DESCRIPTION = "\n".join(textwrap.wrap(DESCRIPTION.strip(), width=64, replace_whitespace=True)) 
     40 
     41try: 
     42    news = list(open("NEWS.rst", "r")) 
     43except IOError: 
     44    description = DESCRIPTION.strip() 
     45else: 
     46    underlines = [i for (i, line) in enumerate(news) if line.startswith("---")] 
     47    news = news[underlines[0]-1:underlines[1]-1] 
     48    news = "".join(news) 
     49    description = "%s\n\n\n%s" % (DESCRIPTION.strip(), news) 
    4150 
    4251 
    4352args=dict( 
    4453    name="ll-orasql", 
    45     version="1.17.5", 
     54    version="1.18", 
    4655    description="Utilities for working with cx_Oracle", 
    47     long_description=DESCRIPTION, 
     56    long_description=description, 
    4857    author=u"Walter Doerwald", 
    4958    author_email="walter@livinglogic.de",