diff --git a/conda/meta.yaml b/conda/meta.yaml index 4a7cf3cf7a5..ae9b7a79e7f 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,11 +1,11 @@ package: name: odl - version: "0.5.4" + version: "0.6.0" source: git_url: https://github.com/odlgroup/odl - git_rev: master # for testing, put any branch here - # git_rev: v0.5.3 # release + # git_rev: master # for testing, put any branch here + git_rev: v0.6.0 # release # git_rev: a542c12d23da7fa5b92b360a51ea14e4804c58f6 # intermediate bugfix revision build: diff --git a/odl/__init__.py b/odl/__init__.py index aa28b9ab621..d7d5d68983b 100644 --- a/odl/__init__.py +++ b/odl/__init__.py @@ -14,7 +14,7 @@ from __future__ import absolute_import -__version__ = '0.5.4.dev0' +__version__ = '0.6.0' __all__ = ('diagnostics', 'discr', 'operator', 'set', 'space', 'solvers', 'tomo', 'trafos', 'util', 'phantom', 'deform', 'ufunc_ops')