From 018660f392b1057a3a5d310182d5a8cf0b4af1a2 Mon Sep 17 00:00:00 2001
From: Erik Frojdh <erik.frojdh@psi.ch>
Date: Mon, 12 Dec 2022 09:09:06 +0100
Subject: [PATCH] fixed conda builds

---
 conda-recepie/build.sh                |  2 +-
 conda-recepie/conda_build_config.yaml |  9 ++++-----
 conda-recepie/meta.yaml               |  7 ++-----
 python/setup.py                       | 16 +++++++++++-----
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/conda-recepie/build.sh b/conda-recepie/build.sh
index 62b9ca1d9..b8f77843e 100755
--- a/conda-recepie/build.sh
+++ b/conda-recepie/build.sh
@@ -21,4 +21,4 @@ echo "Building using: ${NCORES} cores"
 cmake --build . -- -j${NCORES}
 cmake --build . --target install
 
-CTEST_OUTPUT_ON_FAILURE=1 ctest -j 2
+CTEST_OUTPUT_ON_FAILURE=1 ctest -j 1
diff --git a/conda-recepie/conda_build_config.yaml b/conda-recepie/conda_build_config.yaml
index cd5704589..8123e1820 100644
--- a/conda-recepie/conda_build_config.yaml
+++ b/conda-recepie/conda_build_config.yaml
@@ -1,9 +1,8 @@
 python:
-    - 3.6
-    - 3.7
-    - 3.8
-    - 3.9
-    - 3.10
+    # - 3.8
+    # - 3.9
+    # - 3.10
+    - 3.11
     
 numpy: 
     - 1.17
diff --git a/conda-recepie/meta.yaml b/conda-recepie/meta.yaml
index 617854d85..a06d2c4be 100755
--- a/conda-recepie/meta.yaml
+++ b/conda-recepie/meta.yaml
@@ -17,8 +17,7 @@ requirements:
     - {{ compiler('c') }}
     - {{compiler('cxx')}}
     - cmake
-    - qwt 6.*
-    - qt 4.8.*
+    - qt 5.*
     - zeromq
     - xorg-libx11
     - xorg-libice
@@ -111,12 +110,10 @@ outputs:
         - {{ compiler('c') }}
         - {{compiler('cxx')}}
         - {{ pin_subpackage('slsdetlib', exact=True) }}
-        - qwt 6.*
 
       run:
         - {{ pin_subpackage('slsdetlib', exact=True) }}
-        - qwt 6.*
-        - qt 4.8.*
+        - qt 5.*
         - expat
 
   - name: moenchzmq
diff --git a/python/setup.py b/python/setup.py
index 6a4c6bbed..47c732e82 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -7,7 +7,7 @@ Build upon the pybind11 example found here: https://github.com/pybind/python_exa
 
 import os
 import sys
-sys.path.append('../libs/pybind11')
+sys.path.append('../libs/pybind')
 from setuptools import setup, find_packages
 from pybind11.setup_helpers import Pybind11Extension, build_ext
 
@@ -22,19 +22,25 @@ def get_conda_path():
     return os.environ['CONDA_PREFIX']
 
 
-#TODO migrate to CMake build? 
+#TODO migrate to CMake build or fetch files from cmake? 
 ext_modules = [
     Pybind11Extension(
         '_slsdet',
         ['src/main.cpp',
-        'src/current.cpp',
         'src/enums.cpp',
+        'src/current.cpp',
         'src/detector.cpp',
         'src/network.cpp',
         'src/pattern.cpp',
-        'src/scan.cpp',],
+        'src/scan.cpp',
+        'src/duration.cpp',
+        'src/DurationWrapper.cpp',
+        ]
+        
+        
+        ,
         include_dirs=[
-            os.path.join('../libs/pybind11/include'),
+            os.path.join('../libs/pybind/include'),
             os.path.join(get_conda_path(), 'include'),
 
         ],