From 06322245a638e435d29bc8f027aed0bd976139d0 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 27 Sep 2019 15:17:02 +0200 Subject: Increment version to 1.9.9dev --- build/linux/configure.ac | 2 +- include/astra/Globals.h | 2 +- python/astra/__init__.py | 2 +- python/builder.py | 2 +- python/conda/astra-toolbox/meta.yaml | 6 +++--- python/conda/libastra/meta.yaml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/linux/configure.ac b/build/linux/configure.ac index bb4d113..e088f0c 100644 --- a/build/linux/configure.ac +++ b/build/linux/configure.ac @@ -23,7 +23,7 @@ dnl along with the ASTRA Toolbox. If not, see . dnl dnl ----------------------------------------------------------------------- -AC_INIT(astra, 1.9.0dev) +AC_INIT(astra, 1.9.9dev) AC_CONFIG_SRCDIR([Makefile.in]) LT_INIT([disable-static]) diff --git a/include/astra/Globals.h b/include/astra/Globals.h index a353940..3eed113 100644 --- a/include/astra/Globals.h +++ b/include/astra/Globals.h @@ -60,7 +60,7 @@ along with the ASTRA Toolbox. If not, see . #define ASTRA_TOOLBOXVERSION_MAJOR 1 #define ASTRA_TOOLBOXVERSION_MINOR 9 #define ASTRA_TOOLBOXVERSION ((ASTRA_TOOLBOXVERSION_MAJOR)*100 + (ASTRA_TOOLBOXVERSION_MINOR)) -#define ASTRA_TOOLBOXVERSION_STRING "1.9.0dev" +#define ASTRA_TOOLBOXVERSION_STRING "1.9.9dev" #define ASTRA_ASSERT(a) assert(a) diff --git a/python/astra/__init__.py b/python/astra/__init__.py index ae35316..d44e5a2 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, test_noCUDA, test_CUDA -__version__ = '1.9.0dev' +__version__ = '1.9.9.dev' import os diff --git a/python/builder.py b/python/builder.py index ae41eb8..7b00022 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.0dev', + version='1.9.9.dev', 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 b3c036b..78a7394 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.0.dev11' + version: '1.9.9.dev0' source: git_url: https://github.com/astra-toolbox/astra-toolbox.git @@ -33,13 +33,13 @@ requirements: - numpy {{ numpy }} - scipy - six - - libastra ==1.9.0.dev11 + - libastra ==1.9.9.dev0 run: - python - {{ pin_compatible('numpy', min_pin='x.x', max_pin='x.x') }} - scipy - six - - libastra ==1.9.0.dev11 + - libastra ==1.9.9.dev0 about: diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml index 407929b..d6ab1f8 100644 --- a/python/conda/libastra/meta.yaml +++ b/python/conda/libastra/meta.yaml @@ -1,6 +1,6 @@ package: name: libastra - version: '1.9.0.dev11' + version: '1.9.9.dev0' source: git_url: https://github.com/astra-toolbox/astra-toolbox.git -- cgit v1.2.3