summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2017-11-22 17:07:17 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2017-11-22 17:07:17 +0100
commited24fb72a0f506a02a1e4a9df8e63ce62f36efef (patch)
tree4965a0272e5bc80a674b4c058e28e09c61acecb5
parentbd2798bed2fddfe00dac006013a9fb1363417f20 (diff)
downloadastra-ed24fb72a0f506a02a1e4a9df8e63ce62f36efef.tar.gz
astra-ed24fb72a0f506a02a1e4a9df8e63ce62f36efef.tar.bz2
astra-ed24fb72a0f506a02a1e4a9df8e63ce62f36efef.tar.xz
astra-ed24fb72a0f506a02a1e4a9df8e63ce62f36efef.zip
Update version to 1.9.0dev
-rw-r--r--build/linux/configure.ac2
-rw-r--r--include/astra/Globals.h4
-rw-r--r--python/astra/__init__.py2
-rw-r--r--python/builder.py2
-rw-r--r--python/conda/astra-toolbox/meta.yaml4
-rw-r--r--python/conda/libastra/meta.yaml4
6 files changed, 9 insertions, 9 deletions
diff --git a/build/linux/configure.ac b/build/linux/configure.ac
index 0091388..7959792 100644
--- a/build/linux/configure.ac
+++ b/build/linux/configure.ac
@@ -23,7 +23,7 @@ dnl along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
dnl
dnl -----------------------------------------------------------------------
-AC_INIT(astra, 1.8.3)
+AC_INIT(astra, 1.9.0dev)
AC_CONFIG_SRCDIR([Makefile.in])
LT_INIT([disable-static])
diff --git a/include/astra/Globals.h b/include/astra/Globals.h
index f447fd8..128422c 100644
--- a/include/astra/Globals.h
+++ b/include/astra/Globals.h
@@ -58,9 +58,9 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
// macro's
#define ASTRA_TOOLBOXVERSION_MAJOR 1
-#define ASTRA_TOOLBOXVERSION_MINOR 8
+#define ASTRA_TOOLBOXVERSION_MINOR 9
#define ASTRA_TOOLBOXVERSION ((ASTRA_TOOLBOXVERSION_MAJOR)*100 + (ASTRA_TOOLBOXVERSION_MINOR))
-#define ASTRA_TOOLBOXVERSION_STRING "1.8.3"
+#define ASTRA_TOOLBOXVERSION_STRING "1.9.0dev"
#define ASTRA_ASSERT(a) assert(a)
diff --git a/python/astra/__init__.py b/python/astra/__init__.py
index 5e52a1c..4675229 100644
--- a/python/astra/__init__.py
+++ b/python/astra/__init__.py
@@ -41,7 +41,7 @@ from . import log
from .optomo import OpTomo
from .tests import test_noCUDA, test_CUDA
-__version__ = '1.8.3'
+__version__ = '1.9.0dev'
import os
diff --git a/python/builder.py b/python/builder.py
index 01f4203..310f3c3 100644
--- a/python/builder.py
+++ b/python/builder.py
@@ -71,7 +71,7 @@ for m in ext_modules:
'PythonPluginAlgorithm.cpp'))
setup(name='astra-toolbox',
- version='1.8.3',
+ version='1.9.0dev',
description='Python interface to the ASTRA Toolbox',
author='D.M. Pelt',
author_email='D.M.Pelt@cwi.nl',
diff --git a/python/conda/astra-toolbox/meta.yaml b/python/conda/astra-toolbox/meta.yaml
index 88a9172..7331e0f 100644
--- a/python/conda/astra-toolbox/meta.yaml
+++ b/python/conda/astra-toolbox/meta.yaml
@@ -1,10 +1,10 @@
package:
name: astra-toolbox
- version: '1.8.3'
+ version: '1.9.0dev'
source:
git_url: https://github.com/astra-toolbox/astra-toolbox.git
- git_tag: v1.8.3
+ git_tag: master
build:
number: 0
diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml
index e4622b7..2135376 100644
--- a/python/conda/libastra/meta.yaml
+++ b/python/conda/libastra/meta.yaml
@@ -1,10 +1,10 @@
package:
name: libastra
- version: '1.8.3'
+ version: '1.9.0dev'
source:
git_url: https://github.com/astra-toolbox/astra-toolbox.git
- git_tag: v1.8.3
+ git_tag: master
build:
number: 0