detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 03:40:04 +02:00
Code Issues Actions Packages Releases Activity

removed zmq as dependency for slsdet (#870)

Browse Source
This commit is contained in:
Erik Fröjdh 2023-11-24 09:09:29 +01:00 committed by GitHub
parent d7aa3305d1
commit 62dc0e1a34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
conda-recepie/meta.yaml
View File

@ -18,7 +18,6 @@ requirements:
- {{compiler('cxx')}} - {{compiler('cxx')}}
- cmake - cmake
- qt 5.* - qt 5.*
- zeromq
- xorg-libx11 - xorg-libx11
- xorg-libice - xorg-libice
- xorg-libxext - xorg-libxext
@ -37,7 +36,6 @@ requirements:
host: host:
- libstdcxx-ng - libstdcxx-ng
- libgcc-ng - libgcc-ng
- zeromq
- xorg-libx11 - xorg-libx11
- xorg-libice - xorg-libice
- xorg-libxext - xorg-libxext
@ -48,7 +46,6 @@ requirements:
- expat - expat
run: run:
- zeromq
- libstdcxx-ng - libstdcxx-ng
- libgcc-ng - libgcc-ng
@ -63,15 +60,11 @@ outputs:
- {{compiler('cxx')}} - {{compiler('cxx')}}
- libstdcxx-ng - libstdcxx-ng
- libgcc-ng - libgcc-ng
- zeromq
host:
- zeromq
run: run:
- libstdcxx-ng - libstdcxx-ng
- libgcc-ng - libgcc-ng
- zeromq
- name: slsdet - name: slsdet
@ -84,10 +77,12 @@ outputs:
- {{compiler('cxx')}} - {{compiler('cxx')}}
- {{ pin_subpackage('slsdetlib', exact=True) }} - {{ pin_subpackage('slsdetlib', exact=True) }}
- setuptools - setuptools
- pybind11=2.11
host: host:
- python - python
- {{ pin_subpackage('slsdetlib', exact=True) }} - {{ pin_subpackage('slsdetlib', exact=True) }}
- pybind11=2.11
run: run:

4
python/setup.py
View File

@ -7,7 +7,6 @@ Build upon the pybind11 example found here: https://github.com/pybind/python_exa
import os import os
import sys import sys
sys.path.append('../libs/pybind')
from setuptools import setup, find_packages from setuptools import setup, find_packages
from pybind11.setup_helpers import Pybind11Extension, build_ext from pybind11.setup_helpers import Pybind11Extension, build_ext
@ -41,11 +40,10 @@ ext_modules = [
, ,
include_dirs=[ include_dirs=[
os.path.join('../libs/pybind/include'),
os.path.join(get_conda_path(), 'include'), os.path.join(get_conda_path(), 'include'),
], ],
libraries=['SlsDetector', 'SlsSupport', 'SlsReceiver', 'zmq'], libraries=['SlsDetector', 'SlsSupport', 'SlsReceiver'],
library_dirs=[ library_dirs=[
os.path.join(get_conda_path(), 'lib'), os.path.join(get_conda_path(), 'lib'),
], ],