From b7c5deba2182514ffd6af61bac65ec9e0c0ebfd7 Mon Sep 17 00:00:00 2001
From: "Daniel M. Pelt" <D.M.Pelt@cwi.nl>
Date: Wed, 10 Jun 2015 12:45:52 -0500
Subject: Add conda build scripts

---
 python/conda/build.sh  | 16 ++++++++++++++++
 python/conda/meta.yaml | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 python/conda/build.sh
 create mode 100644 python/conda/meta.yaml

(limited to 'python/conda')

diff --git a/python/conda/build.sh b/python/conda/build.sh
new file mode 100644
index 0000000..814ea7e
--- /dev/null
+++ b/python/conda/build.sh
@@ -0,0 +1,16 @@
+cd build/linux
+./autogen.sh
+./configure --with-python --with-cuda=$CUDA_ROOT --prefix=$PREFIX
+if [ $MAKEOPTS == '<UNDEFINED>' ]
+  then
+    MAKEOPTS=""
+fi
+make $MAKEOPTS install-libraries
+make $MAKEOPTS python-root-install
+LIBPATH=lib
+if [ $ARCH == 64 ]
+  then
+    LIBPATH+=64
+fi
+cp -P $CUDA_ROOT/$LIBPATH/libcudart.so.* $PREFIX/lib
+cp -P $CUDA_ROOT/$LIBPATH/libcufft.so.* $PREFIX/lib
diff --git a/python/conda/meta.yaml b/python/conda/meta.yaml
new file mode 100644
index 0000000..45ea812
--- /dev/null
+++ b/python/conda/meta.yaml
@@ -0,0 +1,40 @@
+package:
+  name: astra-toolbox
+  version: '1.6'
+
+source:
+  git_url: https://github.com/astra-toolbox/astra-toolbox.git
+  git_tag: v1.6
+
+build:
+  number: 0
+  script_env:
+    - CUDA_ROOT
+    - MAKEOPTS
+
+test:
+  imports:
+    - astra
+
+requirements:
+  build:
+    - python
+    - cython >=0.13
+    - numpy
+    - six
+
+  run:
+    - python
+    - numpy
+    - scipy
+    - six
+
+
+about:
+  home: http://sourceforge.net/p/astra-toolbox/wiki/Home/
+  license: GPLv3
+  summary: 'The ASTRA Toolbox is a Python toolbox of high-performance GPU primitives for 2D and 3D tomography.'
+
+# See
+# http://docs.continuum.io/conda/build.html for
+# more information about meta.yaml
-- 
cgit v1.2.3


From 8603f9a768c99b18eb74aff13a015fc60fa57ea6 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Fri, 4 Dec 2015 16:20:35 +0100
Subject: Update version to 1.7

---
 build/linux/configure.ac | 2 +-
 include/astra/Globals.h  | 4 ++--
 python/builder.py        | 2 +-
 python/conda/meta.yaml   | 4 ++--
 python/docSRC/conf.py    | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'python/conda')

diff --git a/build/linux/configure.ac b/build/linux/configure.ac
index 7c314f3..38c2946 100644
--- a/build/linux/configure.ac
+++ b/build/linux/configure.ac
@@ -24,7 +24,7 @@ dnl
 dnl -----------------------------------------------------------------------
 dnl $Id$
 
-AC_INIT(astra_toolbox, 1.6.0)
+AC_INIT(astra_toolbox, 1.7.0)
 AC_CONFIG_SRCDIR([Makefile.in])
 LT_INIT([disable-static])
 
diff --git a/include/astra/Globals.h b/include/astra/Globals.h
index f70c3a9..31f1371 100644
--- a/include/astra/Globals.h
+++ b/include/astra/Globals.h
@@ -61,9 +61,9 @@ $Id$
 // macro's
 
 #define ASTRA_TOOLBOXVERSION_MAJOR 1
-#define ASTRA_TOOLBOXVERSION_MINOR 6
+#define ASTRA_TOOLBOXVERSION_MINOR 7
 #define ASTRA_TOOLBOXVERSION ((ASTRA_TOOLBOXVERSION_MAJOR)*100 + (ASTRA_TOOLBOXVERSION_MINOR))
-#define ASTRA_TOOLBOXVERSION_STRING "1.6"
+#define ASTRA_TOOLBOXVERSION_STRING "1.7"
 
 
 #define ASTRA_ASSERT(a) assert(a)
diff --git a/python/builder.py b/python/builder.py
index 44d9c3b..5322182 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.6',
+       version = '1.7',
        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 45ea812..e1adc83 100644
--- a/python/conda/meta.yaml
+++ b/python/conda/meta.yaml
@@ -1,10 +1,10 @@
 package:
   name: astra-toolbox
-  version: '1.6'
+  version: '1.7'
 
 source:
   git_url: https://github.com/astra-toolbox/astra-toolbox.git
-  git_tag: v1.6
+  git_tag: v1.7
 
 build:
   number: 0
diff --git a/python/docSRC/conf.py b/python/docSRC/conf.py
index e54bbb8..cc95a80 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.6'
+version = '1.7'
 # The full version, including alpha/beta/rc tags.
-release = '1.6'
+release = '1.7'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-- 
cgit v1.2.3