diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2016-12-01 06:05:44 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-01 06:05:44 -0800 |
| commit | 298fda68e277c46d06fcf81866318dd0a1010746 (patch) | |
| tree | 7accd8332c6df5597f5776007a3f2db6e14d64af | |
| parent | fbe1a7638adb10e45eeff4b04caadab8ab324a2d (diff) | |
| parent | 7017618690b66e99773355b82afe26ac869d6aa8 (diff) | |
| download | astra-298fda68e277c46d06fcf81866318dd0a1010746.tar.gz astra-298fda68e277c46d06fcf81866318dd0a1010746.tar.bz2 astra-298fda68e277c46d06fcf81866318dd0a1010746.tar.xz astra-298fda68e277c46d06fcf81866318dd0a1010746.zip | |
Merge pull request #82 from wjp/python_version
Add astra.__version__ (PEP396)
| -rw-r--r-- | python/astra/__init__.py | 2 | ||||
| -rw-r--r-- | python/astra/astra.py | 11 | ||||
| -rw-r--r-- | python/astra/astra_c.pyx | 9 | ||||
| -rw-r--r-- | python/conda/libastra/meta.yaml | 2 | ||||
| -rw-r--r-- | python/conda/meta.yaml | 2 |
5 files changed, 4 insertions, 22 deletions
diff --git a/python/astra/__init__.py b/python/astra/__init__.py index 25518b1..6707eff 100644 --- a/python/astra/__init__.py +++ b/python/astra/__init__.py @@ -39,6 +39,8 @@ from . import plugins from . import log from .optomo import OpTomo +__version__ = '1.8rc1' + import os if 'ASTRA_GPU_INDEX' in os.environ: diff --git a/python/astra/astra.py b/python/astra/astra.py index 625f7b4..3804d51 100644 --- a/python/astra/astra.py +++ b/python/astra/astra.py @@ -37,17 +37,6 @@ def use_cuda(): """ return a.use_cuda() - -def version(printToScreen=False): - """Check version of the ASTRA Toolbox. - - :param printToScreen: If ``True``, print version string. If ``False``, return version integer. - :type printToScreen: :class:`bool` - :returns: :class:`string` or :class:`int` -- The version string or integer. - - """ - return a.version(printToScreen) - def set_gpu_index(idx, memory=0): """Set default GPU index to use. diff --git a/python/astra/astra_c.pyx b/python/astra/astra_c.pyx index caa8d02..6de10da 100644 --- a/python/astra/astra_c.pyx +++ b/python/astra/astra_c.pyx @@ -37,8 +37,6 @@ cimport PyIndexManager from .PyIndexManager cimport CAstraObjectManagerBase cdef extern from "astra/Globals.h" namespace "astra": - int getVersion() - string getVersionString() bool cudaEnabled() IF HAVE_CUDA==True: @@ -74,13 +72,6 @@ def credits(): def use_cuda(): return cudaEnabled() - -def version(printToScreen=False): - if printToScreen: - six.print_(wrap_from_bytes(getVersionString())) - else: - return getVersion() - IF HAVE_CUDA==True: def set_gpu_index(idx, memory=0): import collections diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml index c9135ab..25da269 100644 --- a/python/conda/libastra/meta.yaml +++ b/python/conda/libastra/meta.yaml @@ -1,6 +1,6 @@ package: name: libastra - version: '1.8b' + version: '1.8rc1' source: git_url: https://github.com/astra-toolbox/astra-toolbox.git diff --git a/python/conda/meta.yaml b/python/conda/meta.yaml index 738489a..84054c1 100644 --- a/python/conda/meta.yaml +++ b/python/conda/meta.yaml @@ -1,6 +1,6 @@ package: name: astra-toolbox - version: '1.8b' + version: '1.8rc1' source: git_url: https://github.com/astra-toolbox/astra-toolbox.git |