From 7017618690b66e99773355b82afe26ac869d6aa8 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Mon, 28 Nov 2016 15:34:50 +0100
Subject: Add astra.__version__ (PEP396)

---
 python/astra/__init__.py        |  2 ++
 python/astra/astra.py           | 11 -----------
 python/astra/astra_c.pyx        |  9 ---------
 python/conda/libastra/meta.yaml |  2 +-
 python/conda/meta.yaml          |  2 +-
 5 files changed, 4 insertions(+), 22 deletions(-)

(limited to 'python')

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
-- 
cgit v1.2.3