Merge remote-tracking branch 'upstream/develop' into develop

HDFGroup · May 31, 2016 · 7b6bb81 · 7b6bb81
2 parents 0fb3d5e + f3028dc
commit 7b6bb81
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/HDFCompass.1file.spec b/HDFCompass.1file.spec
@@ -65,7 +65,7 @@ else:
 if not os.path.exists(icon_file):
     raise RuntimeError("invalid path to icon: %s" % icon_file)
 
-version = '0.6.0b5'
+version = '0.6.0b6'
 app_name = 'HDFCompass_' + version
 
 a = Analysis(['HDFCompass.py'],

diff --git a/HDFCompass.1folder.spec b/HDFCompass.1folder.spec
@@ -65,7 +65,7 @@ else:
 if not os.path.exists(icon_file):
     raise RuntimeError("invalid path to icon: %s" % icon_file)
 
-version = '0.6.0b5'
+version = '0.6.0b6'
 app_name = 'HDFCompass_' + version
 
 a = Analysis(['HDFCompass.py'],

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.6.0b5
+current_version = 0.6.0b6
 files = setup.py hdf_compass/utils/__init__.py docs/conf.py HDFCompass.1file.spec
 
 [bdist_wheel]

diff --git a/setup.py b/setup.py
@@ -50,7 +50,7 @@ def txt_read(*paths):
 
 setup_args['name'] = 'hdf_compass'
 # The adopted versioning scheme follow PEP40
-setup_args['version'] = '0.6.0b5'
+setup_args['version'] = '0.6.0b6'
 setup_args['url'] = 'https://github.com/HDFGroup/hdf-compass/'
 setup_args['license'] = 'BSD-like license'
 setup_args['author'] = 'HDFGroup'