From 73a39fcafe9999bfdadba6216ad8c024afcd5fc7 Mon Sep 17 00:00:00 2001
From: Erik Frojdh <erik.frojdh@gmail.com>
Date: Tue, 11 Feb 2020 18:22:28 +0100
Subject: [PATCH] WIP

---
 .travis.yml             |  2 +-
 conda-recepie/meta.yaml | 41 ++++++++++++++++++-----------------------
 python/setup.py         |  8 ++------
 3 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ed8f4e692..5d5ee829f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,5 +47,5 @@ deploy:
   provider: script
   script: find $HOME/miniconda/conda-bld/${TRAVIS_OS_NAME}-64 -name "*.tar.bz2" -exec anaconda -t $CONDA_TOKEN upload --force {} \;
   on:
-    branch: developer
+    branch: udp
 
diff --git a/conda-recepie/meta.yaml b/conda-recepie/meta.yaml
index 78ebc3175..342df9c1f 100755
--- a/conda-recepie/meta.yaml
+++ b/conda-recepie/meta.yaml
@@ -1,7 +1,7 @@
 
 package:
   name: sls_detector_software
-  version: "developer"
+  version: "udp"
 
 source:
   - path: ..
@@ -51,38 +51,33 @@ requirements:
 
 
 outputs:
-  - name: sls_detector_lib
+  - name: slslib
     script: copy_lib.sh
 
-  - name: sls_detector
+    requirements:
+      run: 
+        - libstdcxx-ng
+        - libgcc-ng
+        - pyzmq
+
+  - name: slsdet
     script: build_pylib.sh
 
     requirements:
       build:
-        - {{ compiler('c') }}
-        - {{compiler('cxx')}}
         - python {{ python }}
         - setuptools
-        - sls_detector_lib
-        - pyzmq
-        # - pybind11 2.4
-      host:
-        - python
-        # - pybind11 2.4 
-        - pyzmq
-        - sls_detector_lib
-        - libstdcxx-ng
-        - libgcc-ng
+        - wheel
+
       run:
-        - python
+        - python {{ python }}
         - numpy
-        - sls_detector_lib=developer
-        - pyzmq
-        - libstdcxx-ng
-        - libgcc-ng
-    # test:
-    #   imports:
-    #     - sls_detector
+        - slslib=developer
+
+
+    test:
+      imports:
+        - sls_detector
 
     # requirements:
     #   build:
diff --git a/python/setup.py b/python/setup.py
index 6961ca835..8163de6ec 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -117,18 +117,14 @@ def get_shared_lib():
     return [f for f in os.listdir('.') if '_sls_detector' in f]
 
 setup(
-    name='sls_detector',
+    name='slsdetector',
     version=__version__,
     author='Erik Frojdh',
     author_email='erik.frojdh@psi.ch',
     url='https://github.com/slsdetectorgroup/sls_detector',
     description='Detector API for SLS Detector Group detectors',
     long_description='',
-    packages=find_packages(exclude=['contrib', 'docs', 'tests']),
-    # ext_modules=ext_modules,
+    packages=['sls_detector'],
     data_files = [('', get_shared_lib())],
-    # package_data={'sls_detector': ['../build/bin/_sls_detector.cpython-38-x86_64-linux-gnu.so']},
-    # install_requires=['pybind11>=2.2'],
-    # cmdclass={'build_ext': BuildExt},
     zip_safe=False,
 )