summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2016-12-05 14:44:09 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2016-12-05 14:45:59 +0100
commit77f2cedaac088da5107dcfb37ae62d8f3a56f335 (patch)
treed2b3c09da0bfff534afc27c255cda55d9603eef1
parent5036413fea2c61508facc70497a5857eb5ad465e (diff)
downloadastra-77f2cedaac088da5107dcfb37ae62d8f3a56f335.tar.gz
astra-77f2cedaac088da5107dcfb37ae62d8f3a56f335.tar.bz2
astra-77f2cedaac088da5107dcfb37ae62d8f3a56f335.tar.xz
astra-77f2cedaac088da5107dcfb37ae62d8f3a56f335.zip
Update version to 1.8
-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/libastra/meta.yaml5
-rw-r--r--python/conda/meta.yaml9
6 files changed, 11 insertions, 13 deletions
diff --git a/build/linux/configure.ac b/build/linux/configure.ac
index 2f992ad..46c84a5 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.7.1)
+AC_INIT(astra, 1.8.0)
AC_CONFIG_SRCDIR([Makefile.in])
LT_INIT([disable-static])
diff --git a/include/astra/Globals.h b/include/astra/Globals.h
index 3cb466c..dec978d 100644
--- a/include/astra/Globals.h
+++ b/include/astra/Globals.h
@@ -60,9 +60,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 7
+#define ASTRA_TOOLBOXVERSION_MINOR 8
#define ASTRA_TOOLBOXVERSION ((ASTRA_TOOLBOXVERSION_MAJOR)*100 + (ASTRA_TOOLBOXVERSION_MINOR))
-#define ASTRA_TOOLBOXVERSION_STRING "1.7.1"
+#define ASTRA_TOOLBOXVERSION_STRING "1.8"
#define ASTRA_ASSERT(a) assert(a)
diff --git a/python/astra/__init__.py b/python/astra/__init__.py
index 6707eff..b73fff5 100644
--- a/python/astra/__init__.py
+++ b/python/astra/__init__.py
@@ -39,7 +39,7 @@ from . import plugins
from . import log
from .optomo import OpTomo
-__version__ = '1.8rc1'
+__version__ = '1.8'
import os
diff --git a/python/builder.py b/python/builder.py
index f6732ac..ec0bd23 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.7.1',
+ version='1.8',
description='Python interface to the ASTRA Toolbox',
author='D.M. Pelt',
author_email='D.M.Pelt@cwi.nl',
diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml
index 25da269..007cba9 100644
--- a/python/conda/libastra/meta.yaml
+++ b/python/conda/libastra/meta.yaml
@@ -1,11 +1,10 @@
package:
name: libastra
- version: '1.8rc1'
+ version: '1.8'
source:
git_url: https://github.com/astra-toolbox/astra-toolbox.git
- git_rev: master # for testing
- # git_tag: 1.8 # TODO: change to this for next release
+ git_tag: v1.8
build:
number: 0
diff --git a/python/conda/meta.yaml b/python/conda/meta.yaml
index 88c01d1..162103f 100644
--- a/python/conda/meta.yaml
+++ b/python/conda/meta.yaml
@@ -1,11 +1,10 @@
package:
name: astra-toolbox
- version: '1.8rc1'
+ version: '1.8'
source:
git_url: https://github.com/astra-toolbox/astra-toolbox.git
- git_rev: master # for testing
- # git_tag: 1.8 # TODO: change to this for next release
+ git_tag: v1.8
build:
number: 0
@@ -30,14 +29,14 @@ requirements:
- numpy
- scipy
- six
- - libastra ==1.8rc1 # TODO: change to release version
+ - libastra ==1.8
run:
- python
- numpy
- scipy
- six
- - libastra ==1.8rc1 # TODO: change to release version
+ - libastra ==1.8
about: