summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/linux/configure.ac2
-rw-r--r--include/astra/Globals.h6
-rw-r--r--python/builder.py2
-rw-r--r--python/conda/astra-toolbox/meta.yaml6
-rw-r--r--python/conda/libastra/meta.yaml2
-rw-r--r--python/conda/linux_release/release.sh2
6 files changed, 10 insertions, 10 deletions
diff --git a/build/linux/configure.ac b/build/linux/configure.ac
index 64a5ec7..37fa223 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.9.9dev)
+AC_INIT(astra, 2.0.0)
AC_CONFIG_SRCDIR([Makefile.in])
LT_INIT([disable-static])
diff --git a/include/astra/Globals.h b/include/astra/Globals.h
index 6c47b41..cdd7cbd 100644
--- a/include/astra/Globals.h
+++ b/include/astra/Globals.h
@@ -57,10 +57,10 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
//----------------------------------------------------------------------------------------
// macro's
-#define ASTRA_TOOLBOXVERSION_MAJOR 1
-#define ASTRA_TOOLBOXVERSION_MINOR 9
+#define ASTRA_TOOLBOXVERSION_MAJOR 2
+#define ASTRA_TOOLBOXVERSION_MINOR 0
#define ASTRA_TOOLBOXVERSION ((ASTRA_TOOLBOXVERSION_MAJOR)*100 + (ASTRA_TOOLBOXVERSION_MINOR))
-#define ASTRA_TOOLBOXVERSION_STRING "1.9.9dev"
+#define ASTRA_TOOLBOXVERSION_STRING "2.0.0"
#define ASTRA_ASSERT(a) assert(a)
diff --git a/python/builder.py b/python/builder.py
index 18ab4e1..9e35b75 100644
--- a/python/builder.py
+++ b/python/builder.py
@@ -74,7 +74,7 @@ for m in ext_modules:
'PythonPluginAlgorithmFactory.cpp'))
setup(name='astra-toolbox',
- version='1.9.9.dev',
+ version='2.0.0',
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 0526778..641bb97 100644
--- a/python/conda/astra-toolbox/meta.yaml
+++ b/python/conda/astra-toolbox/meta.yaml
@@ -1,6 +1,6 @@
package:
name: astra-toolbox
- version: '1.9.9.dev0'
+ version: '2.0.0'
source:
git_url: https://github.com/astra-toolbox/astra-toolbox.git
@@ -32,13 +32,13 @@ requirements:
- numpy {{ numpy }}
- scipy
- six
- - libastra ==1.9.9.dev0
+ - libastra ==2.0.0
run:
- python
- {{ pin_compatible('numpy', min_pin='x.x', max_pin='x') }}
- scipy
- six
- - libastra ==1.9.9.dev0
+ - libastra ==2.0.0
about:
diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml
index 0d0c7cf..8906225 100644
--- a/python/conda/libastra/meta.yaml
+++ b/python/conda/libastra/meta.yaml
@@ -1,6 +1,6 @@
package:
name: libastra
- version: '1.9.9.dev0'
+ version: '2.0.0'
source:
git_url: https://github.com/astra-toolbox/astra-toolbox.git
diff --git a/python/conda/linux_release/release.sh b/python/conda/linux_release/release.sh
index f324911..75e64c8 100644
--- a/python/conda/linux_release/release.sh
+++ b/python/conda/linux_release/release.sh
@@ -41,7 +41,7 @@ docker build -t astra-build-env-deb11 buildenv.deb11
cp build.sh $D
-V=1.9.9.dev7
+V=2.0.0
docker run -v $D:/out:z astra-build-env-deb8 /bin/bash /out/build.sh $V 0 deb8
docker run -v $D:/out:z astra-build-env-deb9 /bin/bash /out/build.sh $V 0 deb9 full