From 62dc0e1a348476e9443896035c47cbc13b1b1f1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Fr=C3=B6jdh?= Date: Fri, 24 Nov 2023 09:09:29 +0100 Subject: [PATCH] removed zmq as dependency for slsdet (#870) --- conda-recepie/meta.yaml | 9 ++------- python/setup.py | 4 +--- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/conda-recepie/meta.yaml b/conda-recepie/meta.yaml index a06d2c4be..da620c859 100755 --- a/conda-recepie/meta.yaml +++ b/conda-recepie/meta.yaml @@ -18,7 +18,6 @@ requirements: - {{compiler('cxx')}} - cmake - qt 5.* - - zeromq - xorg-libx11 - xorg-libice - xorg-libxext @@ -37,7 +36,6 @@ requirements: host: - libstdcxx-ng - libgcc-ng - - zeromq - xorg-libx11 - xorg-libice - xorg-libxext @@ -48,7 +46,6 @@ requirements: - expat run: - - zeromq - libstdcxx-ng - libgcc-ng @@ -63,15 +60,11 @@ outputs: - {{compiler('cxx')}} - libstdcxx-ng - libgcc-ng - - zeromq - host: - - zeromq run: - libstdcxx-ng - libgcc-ng - - zeromq - name: slsdet @@ -84,10 +77,12 @@ outputs: - {{compiler('cxx')}} - {{ pin_subpackage('slsdetlib', exact=True) }} - setuptools + - pybind11=2.11 host: - python - {{ pin_subpackage('slsdetlib', exact=True) }} + - pybind11=2.11 run: diff --git a/python/setup.py b/python/setup.py index aee81b640..a467a4727 100755 --- a/python/setup.py +++ b/python/setup.py @@ -7,7 +7,6 @@ Build upon the pybind11 example found here: https://github.com/pybind/python_exa import os import sys -sys.path.append('../libs/pybind') from setuptools import setup, find_packages from pybind11.setup_helpers import Pybind11Extension, build_ext @@ -41,11 +40,10 @@ ext_modules = [ , include_dirs=[ - os.path.join('../libs/pybind/include'), os.path.join(get_conda_path(), 'include'), ], - libraries=['SlsDetector', 'SlsSupport', 'SlsReceiver', 'zmq'], + libraries=['SlsDetector', 'SlsSupport', 'SlsReceiver'], library_dirs=[ os.path.join(get_conda_path(), 'lib'), ],