[h5py] 172/455: Import fixes from 1.0 branch

[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 7f4b05e0326442fc6edef8663d1f281845878d1e
Author: andrewcollette <andrew.collette at gmail.com>
Date:   Mon Dec 1 03:05:57 2008 +0000

    Import fixes from 1.0 branch
---
 h5py/__init__.py | 2 +-
 setup.py         | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/h5py/__init__.py b/h5py/__init__.py
index 69deb37..546734f 100644
--- a/h5py/__init__.py
+++ b/h5py/__init__.py
@@ -29,7 +29,7 @@ except ImportError, e:
         raise ImportError('Import error:\n"%s"\n\nBe sure to exit source directory before importing h5py' % e)
     raise
 
-import utils, h5, h5a, h5d, h5f, h5g, h5i, h5p, h5r, h5s, h5t, h5z, highlevel, version
+import utils, h5, h5a, h5d, h5f, h5fd, h5g, h5i, h5p, h5r, h5s, h5t, h5z, highlevel, version
 
 from highlevel import File, Group, Dataset, Datatype, AttributeManager, CoordsList
 from h5 import H5Error, get_config
diff --git a/setup.py b/setup.py
index 5cf173c..5a1f4c1 100644
--- a/setup.py
+++ b/setup.py
@@ -220,6 +220,11 @@ class cybuild(build):
 
     def run(self):
 
+        # Hack to prevent "install" command from running Cython
+        if not 'build' in sys.argv:
+            build.run(self)
+            return
+
         if self.api is None:
             self.api = self.get_hdf5_version()  # either 16 or 18
 

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