summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS.txt5
-rw-r--r--build/linux/configure.ac2
-rw-r--r--include/astra/Globals.h2
-rw-r--r--python/builder.py2
-rw-r--r--python/conda/meta.yaml4
-rw-r--r--python/docSRC/conf.py4
6 files changed, 12 insertions, 7 deletions
diff --git a/NEWS.txt b/NEWS.txt
index f120153..1efed4e 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -9,6 +9,11 @@ Contact: astra@uantwerpen.be
Website: http://sf.net/projects/astra-toolbox
-----------------------------------------------------------------------
+1.7.1beta (2015-12-23)
+ * NB: This release has a beta tag as it contains two new
+ big experimental features.
+ * fix crash with certain 2D CUDA FP calls
+
1.7beta (2015-12-04)
* NB: This release has a beta tag as it contains two new
big experimental features.
diff --git a/build/linux/configure.ac b/build/linux/configure.ac
index 38c2946..85e4324 100644
--- a/build/linux/configure.ac
+++ b/build/linux/configure.ac
@@ -24,7 +24,7 @@ dnl
dnl -----------------------------------------------------------------------
dnl $Id$
-AC_INIT(astra_toolbox, 1.7.0)
+AC_INIT(astra_toolbox, 1.7.1)
AC_CONFIG_SRCDIR([Makefile.in])
LT_INIT([disable-static])
diff --git a/include/astra/Globals.h b/include/astra/Globals.h
index 31f1371..5dbac83 100644
--- a/include/astra/Globals.h
+++ b/include/astra/Globals.h
@@ -63,7 +63,7 @@ $Id$
#define ASTRA_TOOLBOXVERSION_MAJOR 1
#define ASTRA_TOOLBOXVERSION_MINOR 7
#define ASTRA_TOOLBOXVERSION ((ASTRA_TOOLBOXVERSION_MAJOR)*100 + (ASTRA_TOOLBOXVERSION_MINOR))
-#define ASTRA_TOOLBOXVERSION_STRING "1.7"
+#define ASTRA_TOOLBOXVERSION_STRING "1.7.1"
#define ASTRA_ASSERT(a) assert(a)
diff --git a/python/builder.py b/python/builder.py
index 5322182..018b26b 100644
--- a/python/builder.py
+++ b/python/builder.py
@@ -71,7 +71,7 @@ ext_modules = cythonize("astra/*.pyx", language_level=2)
cmdclass = { 'build_ext': build_ext }
setup (name = 'PyASTRAToolbox',
- version = '1.7',
+ version = '1.7.1',
description = 'Python interface to the ASTRA-Toolbox',
author='D.M. Pelt',
author_email='D.M.Pelt@cwi.nl',
diff --git a/python/conda/meta.yaml b/python/conda/meta.yaml
index e1adc83..41250dc 100644
--- a/python/conda/meta.yaml
+++ b/python/conda/meta.yaml
@@ -1,10 +1,10 @@
package:
name: astra-toolbox
- version: '1.7'
+ version: '1.7.1'
source:
git_url: https://github.com/astra-toolbox/astra-toolbox.git
- git_tag: v1.7
+ git_tag: v1.7.1
build:
number: 0
diff --git a/python/docSRC/conf.py b/python/docSRC/conf.py
index cc95a80..78f7d42 100644
--- a/python/docSRC/conf.py
+++ b/python/docSRC/conf.py
@@ -48,9 +48,9 @@ copyright = u'2013, Centrum Wiskunde & Informatica, Amsterdam'
# built documents.
#
# The short X.Y version.
-version = '1.7'
+version = '1.7.1'
# The full version, including alpha/beta/rc tags.
-release = '1.7'
+release = '1.7.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.