[h5py] 264/455: Update version info

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to annotated tag 1.3.0
in repository h5py.

commit ba9e4fa7b427e36c1f54357754216fa696c4e9c0
Author: andrewcollette <andrew.collette at gmail.com>
Date:   Tue Jun 2 19:33:11 2009 +0000

    Update version info
---
 README.txt                  | 2 +-
 docs/source/conf.py         | 6 +++---
 docs/source/guide/build.rst | 2 +-
 docs/source/index.rst       | 6 +++---
 h5py/h5.pyx                 | 4 ++--
 h5py/version.py             | 6 ++++--
 setup.py                    | 2 +-
 7 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/README.txt b/README.txt
index d8506f1..7a917a6 100644
--- a/README.txt
+++ b/README.txt
@@ -2,7 +2,7 @@ README for the "h5py" Python/HDF5 interface
 ===========================================
 Copyright (c) 2008 Andrew Collette
 
-Version 1.1.0
+Version 1.2.0 *BETA*
 
 * http://h5py.alfven.org        Main site, docs, quick-start guide
 * http://h5py.googlecode.com    Downloads, FAQ and bug tracker
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 6541dea..a2d245a 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -46,9 +46,9 @@ copyright = '2008, Andrew Collette'
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.1'
+version = '1.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.0'
+release = '1.2.0-beta'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
@@ -91,7 +91,7 @@ html_style = 'h5py.css'
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-html_title = "HDF5 for Python 1.1"
+html_title = "HDF5 for Python 1.2 BETA"
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #html_short_title = None
diff --git a/docs/source/guide/build.rst b/docs/source/guide/build.rst
index 32388d9..c18dbac 100644
--- a/docs/source/guide/build.rst
+++ b/docs/source/guide/build.rst
@@ -19,7 +19,7 @@ On Windows, HDF5 is provided as part of the integrated
 installer for h5py.  
 
 On Linux and OS-X, you must provide HDF5 yourself.  HDF5 versions **1.6.5**
-through **1.8.2** are supported. **The best solution is
+through **1.8.3** are supported. **The best solution is
 to install HDF5 via a package manager like apt, yum or fink.** Regardless of
 how you decide to install HDF5, keep the following in mind:
 
diff --git a/docs/source/index.rst b/docs/source/index.rst
index e7cf169..5a01809 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -1,9 +1,9 @@
 
 .. _home:
 
-*******************
-HDF5 for Python 1.1
-*******************
+***************
+HDF5 for Python
+***************
 
 The `HDF5 library <http://www.hdfgroup.com/HDF5>`_ is a versatile,
 mature library designed for the storage
diff --git a/h5py/h5.pyx b/h5py/h5.pyx
index 5458358..35f5626 100644
--- a/h5py/h5.pyx
+++ b/h5py/h5.pyx
@@ -443,8 +443,8 @@ init_hdf5()
 
 _hdf5_version_tuple = get_libversion()        
 _api_version_tuple = (int(H5PY_API/10), H5PY_API%10)
-_version_tuple = tuple([int(x) for x in H5PY_VERSION.split('.')])
-
+_version_tuple = tuple([int(x) for x in H5PY_VERSION.split('-')[0].split('.')])
+_version_string = H5PY_VERSION
 
 
 from h5e import H5Error
diff --git a/h5py/version.py b/h5py/version.py
index aa2e229..4148d10 100644
--- a/h5py/version.py
+++ b/h5py/version.py
@@ -1,7 +1,9 @@
 import h5 as _h5
 
-version_tuple = _h5._version_tuple
-version = "%d.%d.%d" % version_tuple
+version = _h5._version_string
+_exp = version.partition('-')
+version_tuple = tuple(int(x) for x in _exp[0].split('.')) + (_exp[2],)
+
 
 hdf5_version_tuple = _h5._hdf5_version_tuple
 hdf5_version = "%d.%d.%d" % hdf5_version_tuple
diff --git a/setup.py b/setup.py
index 0d60214..3d6fec4 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ import os.path as op
 import pickle
 
 NAME = 'h5py'
-VERSION = '1.1.0'
+VERSION = '1.2.0-beta'
 MIN_NUMPY = '1.0.3'
 MIN_CYTHON = '0.9.8.1.1'
 SRC_PATH = 'h5py'           # Name of directory with .pyx files

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/h5py.git