Skip to content

Commit 1204eab

Browse files
committed
changed hdf5 support so that it is an optional extra
1 parent 0e5257d commit 1204eab

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ addons:
1010
packages:
1111
- libhdf5-serial-dev
1212
install:
13-
- pip install .
14-
- pip install coveralls
15-
- pip install numpy
13+
- pip install -e .[hdf5]
14+
- pip install numpy coveralls
1615
script:
1716
nosetests test/unittests --with-coverage --cover-package=nineml
1817
after_success:

README.rst

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,12 @@ community please consider contributing to the catalog via a pull request.
7070
Installation
7171
------------
7272

73-
HDF5 (dev)
74-
~~~~~~~~~~
73+
The NineML Python Library can be installed using *pip*::
74+
75+
$ pip install nineml
76+
77+
HDF5 Support
78+
~~~~~~~~~~~~
7579

7680
To add support to read or write HDF5_ serialisations you must first install
7781
a HDF5_ dev library (i.e. with the C headers).
@@ -86,15 +90,9 @@ On Ubuntu/Debian HDF5_ can be installed by one of the following packages:
8690
* libhdf5-openmpi-dev (parallel with Open MPI)
8791
* libhdf5-mpich-dev (parallel with MPICH)
8892

89-
If you don't install HDF5_ the other serialisation formats can still be used
90-
but you will need to install the package manually (i.e. not use *pip*).
93+
Then to install *pype9* with support for HDF5_ select the 'hdf5' extra::
9194

92-
Pip
93-
~~~
94-
95-
The NineML Python Library can be installed using *pip*::
96-
97-
$ pip install nineml
95+
$ pip install nineml[hdf5]
9896

9997
:copyright: Copyright 20011-2017 by the NineML Python Library team, see AUTHORS.
10098
:license: BSD 3, see LICENSE for details.

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@
4343
'Topic :: Scientific/Engineering'],
4444
install_requires=['lxml>=3.7.3',
4545
'future>=0.16.0',
46-
'h5py>=2.7.0',
4746
'PyYAML>=3.1',
4847
'sympy>=1.1'],
48+
extras_require={
49+
'hdf5': 'h5py>=2.7.0'},
4950
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, <4',
5051
tests_require=['nose', 'numpy']
5152
)

0 commit comments

Comments
 (0)