Commit c30b8eb0 authored by Alejandro Homs Puron's avatar Alejandro Homs Puron
Browse files

Merge branch 'fix-python-binding' into 'master'

Fix python binding

See merge request !4
parents 7228587a 51d6c570
Pipeline #44145 passed with stages
in 18 minutes and 24 seconds
blas_impl:
- mkl # [x86_64]
c_compiler:
- vs2017 # [win]
- vs2019 # [win]
cxx_compiler:
- vs2017 # [win]
- vs2019 # [win]
python:
- 2.7 # [linux]
- 3.6
- 3.7
# This differs from target_platform in that it determines what subdir the compiler
# will target, not what subdir the compiler package will be itself.
......
......@@ -18,27 +18,19 @@ build:
requirements:
host:
- python {{ python }}
- numpy
- sip 4.19.8 # For compatibility with pyqt 5.9.2
- lima-core
build:
- git
- cmake
- {{ compiler('cxx') }}
run:
- python {{ python }}
- python
- sip >=4.19.4, <=4.19.8 # For compatibility with pyqt 5.9.2
- {{ pin_compatible('lima-core', max_pin='x.x') }}
test:
requires:
- cmake
imports:
- Lima.Xh
commands:
- cmake --version
- ctest --version
- cpack --version
about:
home: https://github.com/esrf-bliss/Lima
......
......@@ -41,9 +41,8 @@ namespace Xh
virtual void prepareAcq();
virtual void startAcq();
virtual void stopAcq();
virtual void getStatus(StatusType& status);
virtual void getStatus(HwInterface::StatusType& status /Out/);
virtual int getNbHwAcquiredFrames();
};
};
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment