diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-11-06 14:40:01 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-11-06 14:54:03 +0100 |
| commit | bfceef4da377c32cd59d1e51efb9aa1a21c7f4bd (patch) | |
| tree | 2162374a91f7e2cdc5c88469fde781660d480d20 | |
| parent | 454bb20b5d7eb36f1efbf6659652ace26cc229e0 (diff) | |
| download | astra-bfceef4da377c32cd59d1e51efb9aa1a21c7f4bd.tar.gz astra-bfceef4da377c32cd59d1e51efb9aa1a21c7f4bd.tar.bz2 astra-bfceef4da377c32cd59d1e51efb9aa1a21c7f4bd.tar.xz astra-bfceef4da377c32cd59d1e51efb9aa1a21c7f4bd.zip | |
Update version to 1.8.3
| -rw-r--r-- | build/linux/configure.ac | 2 | ||||
| -rw-r--r-- | build/msvc/build_env.bat | 4 | ||||
| -rw-r--r-- | include/astra/Globals.h | 2 | ||||
| -rw-r--r-- | python/astra/__init__.py | 2 | ||||
| -rw-r--r-- | python/builder.py | 2 | ||||
| -rw-r--r-- | python/conda/astra-toolbox/meta.yaml | 8 | ||||
| -rw-r--r-- | python/conda/libastra/meta.yaml | 4 |
7 files changed, 12 insertions, 12 deletions
diff --git a/build/linux/configure.ac b/build/linux/configure.ac index b95d94f..0091388 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.0) +AC_INIT(astra, 1.8.3) AC_CONFIG_SRCDIR([Makefile.in]) LT_INIT([disable-static]) diff --git a/build/msvc/build_env.bat b/build/msvc/build_env.bat index 8cb7c96..56c811f 100644 --- a/build/msvc/build_env.bat +++ b/build/msvc/build_env.bat @@ -12,5 +12,5 @@ set B_VCREDIST=D:\wjp\vs2015u3_redist\vc_redist.x64.exe set B_README_WP27=C:\WinPython-64bit-%B_WP27%\python-%B_WP27:~0,-2%.amd64\Lib\site-packages set B_README_WP35=C:\WinPython-64bit-%B_WP35%\python-%B_WP35:~0,-2%.amd64\Lib\site-packages -set B_RELEASE_TAG=v1.8 -set B_RELEASE=1.8 +set B_RELEASE_TAG=v1.8.3 +set B_RELEASE=1.8.3 diff --git a/include/astra/Globals.h b/include/astra/Globals.h index 7c1e9a8..f447fd8 100644 --- a/include/astra/Globals.h +++ b/include/astra/Globals.h @@ -60,7 +60,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #define ASTRA_TOOLBOXVERSION_MAJOR 1 #define ASTRA_TOOLBOXVERSION_MINOR 8 #define ASTRA_TOOLBOXVERSION ((ASTRA_TOOLBOXVERSION_MAJOR)*100 + (ASTRA_TOOLBOXVERSION_MINOR)) -#define ASTRA_TOOLBOXVERSION_STRING "1.8" +#define ASTRA_TOOLBOXVERSION_STRING "1.8.3" #define ASTRA_ASSERT(a) assert(a) diff --git a/python/astra/__init__.py b/python/astra/__init__.py index 8238a88..5e52a1c 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' +__version__ = '1.8.3' import os diff --git a/python/builder.py b/python/builder.py index ec0bd23..01f4203 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', + version='1.8.3', 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 2b25c44..88a9172 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' + version: '1.8.3' source: git_url: https://github.com/astra-toolbox/astra-toolbox.git - git_tag: v1.8 + git_tag: v1.8.3 build: number: 0 @@ -28,14 +28,14 @@ requirements: - numpy {{ numpy }} - scipy - six - - libastra ==1.8 + - libastra ==1.8.3 run: - python - {{ pin_compatible('numpy', max_pin='x.x') }} - scipy - six - - libastra ==1.8 + - libastra ==1.8.3 about: diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml index 6176f30..e4622b7 100644 --- a/python/conda/libastra/meta.yaml +++ b/python/conda/libastra/meta.yaml @@ -1,10 +1,10 @@ package: name: libastra - version: '1.8' + version: '1.8.3' source: git_url: https://github.com/astra-toolbox/astra-toolbox.git - git_tag: v1.8 + git_tag: v1.8.3 build: number: 0 |