Skip to content

Commit

Permalink
Merge pull request #83 from mschmidt87/release/1.1.0
Browse files Browse the repository at this point in the history
Release/1.1.0
  • Loading branch information
jakobj authored Apr 18, 2018
2 parents 601978a + ffa30d8 commit 9271cc4
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

# General information about the project.
project = u'h5py_wrapper'
copyright = u'2016, Maximilian Schmidt, Jakob Jordan'
copyright = u'2018, Maximilian Schmidt, Jakob Jordan'
author = u'Maximilian Schmidt, Jakob Jordan'

# The version info for the project you're documenting, acts as replacement for
Expand Down
2 changes: 1 addition & 1 deletion doc/conversion.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Conversion from old release versions
.. toctree::
:maxdepth: 2

Release version 1.0.0 introduced some changes to the file format (see `Release notes
Release version 1.0.1 introduced some changes to the file format (see `Release notes
<https://github.com/INM-6/h5py_wrapper/releases>`_).

.. literalinclude:: ../convert_h5file
Expand Down
8 changes: 8 additions & 0 deletions doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ Conversion from old releases

conversion

Release Notes
=============
.. toctree::
:maxdepth: 2

release_notes



Indices and tables
==================
Expand Down
2 changes: 1 addition & 1 deletion h5py_wrapper/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
from .wrapper import load


__version__ = '1.0.0'
__version__ = '1.1.0'
7 changes: 3 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@

setup(
name='h5py_wrapper',
version='1.0.0',
version='1.1.0',
author='Maximilian Schmidt, Jakob Jordan',
author_email='[email protected]',
description=('A wrapper to conveniently store nested Python dictionaries in hdf5 files.'),
license='GPL2',
keywords='hdf5 h5py',
url='https://github.com/INM-6/h5py_wrapper',
packages=['h5py_wrapper', 'tests'],
python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*, !=3.4.*, <4',
scripts=['convert_h5file'],
setup_requires=['pytest-runner'],
install_requires=['h5py', 'pytest-runner'],
tests_require=['pytest'],
long_description=open('README.rst').read(),
classifiers=[
Expand All @@ -23,7 +23,6 @@
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Topic :: Utilities',
Expand Down

0 comments on commit 9271cc4

Please sign in to comment.