Preparation for release of 0.7.4

python-excel · Apr 1, 2012 · 8acc6bf · 8acc6bf
1 parent e3de069
commit 8acc6bf
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/make_doc.bat b/make_doc.bat
@@ -1,6 +1,5 @@
-cd \xlrd\svnco-trunk-Dec2010
-c:\python25\python pkg_doc.py c:/xlrd/svnco-trunk-Dec2010/xlrd
-c:\python25\python pythondoc.py xlrd\compdoc.py
+c:\python25\python pkg_doc.py xlrd
+c:\python25\python pythondoc.py xlrd/compdoc.py
 del compdoc.html
 rename pythondoc-compdoc.html compdoc.html
 copy xlrd.html xlrd\doc

diff --git a/setup.py b/setup.py
@@ -4,8 +4,6 @@
 import sys
 python_version = sys.version_info[:2]
 
-from xlrd import __VERSION__
-
 av = sys.argv
 if len(av) > 1 and av[1].lower() == "--egg":
     if python_version < (2, 3):
@@ -22,7 +20,7 @@ def mkargs(**kwargs):
 
 args = mkargs(
     name = 'xlrd',
-    version = __VERSION__,
+    version = '0.7.4',
     author = 'John Machin',
     author_email = 'sjmachin@lexicon.net',
     url = the_url,

diff --git a/xlrd/__init__.py b/xlrd/__init__.py
@@ -1,17 +1,17 @@
-# -*- coding: cp1252 -*-
+# -*- coding: ascii -*-
 
-__VERSION__ = "0.7.4a"
+__VERSION__ = "0.7.4"
 
-# <p>Copyright © 2005-2012 Stephen John Machin, Lingfo Pty Ltd</p>
+# <p>Copyright (c) 2005-2012 Stephen John Machin, Lingfo Pty Ltd</p>
 # <p>This module is part of the xlrd package, which is released under a
 # BSD-style licence.</p>
 
 import licences
 
 ##
-# <p><b>A Python module for extracting data from MS Excel ™ spreadsheet files.
+# <p><b>A Python module for extracting data from MS Excel (TM) spreadsheet files.
 # <br /><br />
-# Version 0.7.4a -- March 2012
+# Version 0.7.4 -- April 2012
 # </b></p>
 #
 # <h2>General information</h2>

diff --git a/xlrd/doc/xlrd.html b/xlrd/doc/xlrd.html
@@ -6,9 +6,9 @@
 </head>
 <body>
 <h1>The xlrd Module</h1>
-<p /><p><b>A Python module for extracting data from MS Excel &#8482; spreadsheet files.
+<p /><p><b>A Python module for extracting data from MS Excel (TM) spreadsheet files.
 <br /><br />
-Version 0.7.3 -- February/March 2012
+Version 0.7.4 -- April 2012
 </b></p>
 
 <h2>General information</h2>
@@ -861,7 +861,8 @@ <h2><a id='__init__.Book-class' name='__init__.Book-class'>The Book Class</a></h
 <i>built_in</i> 1 = built-in style, 0 = user-defined<br />
 <i>xf_index</i> is an index into Book.xf_list.<br />
 References: OOo docs s6.99 (STYLE record); Excel UI Format/Style
-<br /> -- New in version 0.6.1
+<br /> -- New in version 0.6.1; since 0.7.4, extracted only if
+open_workbook(..., formatting_info=True)
 </p></dd>
 <dt><a id='__init__.Book.unload_sheet-method' name='__init__.Book.unload_sheet-method'><b>unload_sheet(sheet_name_or_index)</b></a> [<a href='#__init__.Book.unload_sheet-method'>#</a>]</dt>
 <dd>
@@ -1147,8 +1148,8 @@ <h2><a id='sheet.Hyperlink-class' name='sheet.Hyperlink-class'>The Hyperlink Cla
 <dt><b>Hyperlink</b> (class)  [<a href='#sheet.Hyperlink-class'>#</a>]</dt>
 <dd>
 <p /><p>Contains the attributes of a hyperlink.
-Hyperlink objects are accessible through Sheet.<a class="link" href="#sheet.Sheet.hyperlink_list-attribute"><b>hyperlink_list</b></a>
-and Sheet.<a class="link" href="#sheet.Sheet.hyperlink_map-attribute"><b>hyperlink_map</b></a>.
+Hyperlink objects are accessible through Sheet.<a class="link" href="#sheet.Sheet.hyperlink_list-variable"><b>hyperlink_list</b></a>
+and Sheet.<a class="link" href="#sheet.Sheet.hyperlink_map-variable"><b>hyperlink_map</b></a>.
 <br />-- New in version 0.7.2
 </p>
 </dd>
@@ -1311,7 +1312,7 @@ <h2><a id='sheet.Note-class' name='sheet.Note-class'>The Note Class</a></h2>
 <dt><b>Note</b> (class)  [<a href='#sheet.Note-class'>#</a>]</dt>
 <dd>
 <p /><p> Represents a user "comment" or "note".
-Note objects are accessible through Sheet.<a class="link" href="#sheet.Sheet.cell_note_map-attribute"><b>cell_note_map</b></a>.
+Note objects are accessible through Sheet.<a class="link" href="#sheet.Sheet.cell_note_map-variable"><b>cell_note_map</b></a>.
 <br />-- New in version 0.7.2
 </p>
 </dd>
@@ -1330,7 +1331,7 @@ <h2><a id='sheet.Note-class' name='sheet.Note-class'>The Note Class</a></h2>
 <dt><a id='sheet.Note.rich_text_runlist-attribute' name='sheet.Note.rich_text_runlist-attribute'><b>rich_text_runlist</b></a> [<a href='#sheet.Note.rich_text_runlist-attribute'>#</a>]</dt>
 <dd>
 <p>List of (offset_in_string, font_index) tuples.
-Unlike Sheet.<a class="link" href="#sheet.Sheet.rich_text_runlist_map-attribute"><b>rich_text_runlist_map</b></a>, the first offset should always be 0.
+Unlike Sheet.<a class="link" href="#sheet.Sheet.rich_text_runlist_map-variable"><b>rich_text_runlist_map</b></a>, the first offset should always be 0.
 </p></dd>
 <dt><a id='sheet.Note.row_hidden-attribute' name='sheet.Note.row_hidden-attribute'><b>row_hidden</b></a> [<a href='#sheet.Note.row_hidden-attribute'>#</a>]</dt>
 <dd>
@@ -1682,7 +1683,7 @@ <h2><a id='sheet.Sheet-class' name='sheet.Sheet-class'>The Sheet Class</a></h2>
 </dd>
 <dt><a id='sheet.Sheet.hyperlink_map-attribute' name='sheet.Sheet.hyperlink_map-attribute'><b>hyperlink_map</b></a> [<a href='#sheet.Sheet.hyperlink_map-attribute'>#</a>]</dt>
 <dd>
-<p /><p>A sparse mapping from (rowx, colx) to an item in <a class="link" href="#sheet.Sheet.hyperlink_list-attribute"><b>hyperlink_list</b></a>.
+<p /><p>A sparse mapping from (rowx, colx) to an item in <a class="link" href="#sheet.Sheet.hyperlink_list-variable"><b>hyperlink_list</b></a>.
 Cells not covered by a hyperlink are not mapped.
 It is possible using the Excel UI to set up a hyperlink that
 covers a larger-than-1x1 rectangle of cells.
@@ -1759,7 +1760,7 @@ <h2><a id='sheet.Sheet-class' name='sheet.Sheet-class'>The Sheet Class</a></h2>
 <dd>
 <p>Returns the effective number of cells in the given row. For use with
 open_workbook(ragged_rows=True) which is likely to produce rows
-with fewer than <a class="link" href="#sheet.Sheet.ncols-attribute"><b>ncols</b></a> cells.
+with fewer than <a class="link" href="#sheet.Sheet.ncols-variable"><b>ncols</b></a> cells.
 <br /> -- New in version 0.7.2
 </p></dd>
 <dt><a id='sheet.Sheet.row_slice-method' name='sheet.Sheet.row_slice-method'><b>row_slice(rowx, start_colx=0, end_colx=None)</b></a> [<a href='#sheet.Sheet.row_slice-method'>#</a>]</dt>