Commit e04cdd88 authored by Samuel Debionne's avatar Samuel Debionne

Update sip and build for Python 3.8

parent eb32f09e
Pipeline #42164 passed with stages
in 33 minutes and 52 seconds
......@@ -6,6 +6,7 @@ cxx_compiler:
- vs2017 # [win]
python:
- 3.7
- 3.8
# This differs from target_platform in that it determines what subdir the compiler
# will target, not what subdir the compiler package will be itself.
# For example, we need a win-64 vs2008_win-32 package, so that we compile win-32
......
......@@ -20,7 +20,7 @@ build:
requirements:
host:
- python {{ python }}
- sip 4.19.8 #For the SIP module
- sip
- processlib
- libconfig 1.7*
# I/O formats
......@@ -37,12 +37,12 @@ requirements:
- {{ compiler('cxx') }}
run:
- python
- sip >=4.19.4, <=4.19.8 # For compatibility with pyqt 5.9.2
- {{ pin_compatible('sip', max_pin='x.x.x') }}
- {{ pin_compatible('processlib', max_pin='x.x') }}
- libconfig 1.7*
# I/O formats
- zlib
- lz4-c 1.8.2
- lz4-c 1.8.2*
- hdf5 1.10*
- libtiff
- cbflib # [linux]
......@@ -50,14 +50,8 @@ requirements:
- libnuma # [linux]
test:
requires:
- cmake
- python {{ python }}
imports:
- Lima.Core
#commands:
# - cd build
# - ctest --timeout 10 --output-on-failure
about:
home: https://github.com/esrf-bliss/Lima
......
......@@ -6,6 +6,7 @@ cxx_compiler:
- vs2017 # [win]
python:
- 3.7
- 3.8
# This differs from target_platform in that it determines what subdir the compiler
# will target, not what subdir the compiler package will be itself.
# For example, we need a win-64 vs2008_win-32 package, so that we compile win-32
......
......@@ -18,7 +18,7 @@ build:
requirements:
host:
- python {{ python }}
- sip 4.19.8 #For the SIP module
- sip
- processlib
- libconfig 1.7*
# I/O formats
......@@ -35,12 +35,12 @@ requirements:
- {{ compiler('cxx') }}
run:
- python
- sip >=4.19.4, <=4.19.8 # For compatibility with pyqt 5.9.2
- {{ pin_compatible('sip', max_pin='x.x.x') }}
- {{ pin_compatible('processlib', max_pin='x.x') }}
- libconfig 1.7*
# I/O formats
- zlib
- lz4-c 1.8.2
- lz4-c 1.8.2*
- hdf5 1.10*
- libtiff
- cbflib # [linux]
......@@ -48,16 +48,10 @@ requirements:
- libnuma # [linux]
test:
# requires:
# - cmake
# - python {{ python }}
imports:
- Lima.Core
downstreams:
- lima-camera-simulator
# commands:
# - cd build
# - ctest --timeout 10 --output-on-failure
#downstreams:
# - lima-camera-simulator
about:
home: https://github.com/esrf-bliss/Lima
......
......@@ -105,4 +105,7 @@ public:
void registerThresholdCallback(ThresholdCallback &cb);
void unregisterThresholdCallback(ThresholdCallback &cb);
private:
CtAccumulation(const CtAccumulation&);
};
......@@ -104,6 +104,9 @@ using namespace lima;
void getTriggerModeList(TrigModeList& modes /Out/) const;
bool isMonitorMode() const;
private:
CtAcquisition(const CtAcquisition&);
};
%MappedType CtAcquisition::AutoExposureModeList
......
......@@ -26,7 +26,7 @@ class CtBuffer {
#include <sstream>
using namespace lima;
%End
public:
public:
struct Parameters {
BufferMode mode;
long nbBuffers;
......@@ -66,4 +66,7 @@ using namespace lima;
int readBlockLen=1);
bool waitBuffersReleased(double timeout=-1);
private:
CtBuffer(const CtBuffer&);
};
......@@ -25,18 +25,20 @@ class CtEvent {
#include <sstream>
using namespace lima;
%End
public:
public:
CtEvent(CtControl& ct);
~CtEvent();
CtEvent(CtControl& ct);
~CtEvent();
bool hasCapability() const;
bool hasCapability() const;
void resetEventList();
virtual void registerEventCallback(EventCallback& cb);
virtual void unregisterEventCallback(EventCallback& cb);
void resetEventList();
virtual void reportEvent(Event *event /Transfer/);
virtual void registerEventCallback(EventCallback& cb);
virtual void unregisterEventCallback(EventCallback& cb);
virtual void reportEvent(Event *event /Transfer/);
private:
CtEvent(const CtEvent&);
};
......@@ -149,4 +149,7 @@ using namespace lima;
void getRotation(RotationMode &rotation /Out/) const;
void reset();
private:
CtImage(const CtImage&);
};
......@@ -277,4 +277,7 @@ using namespace lima;
void getMaxConcurrentWritingTask(int& nb_thread /Out/,int stream_idx = 0) const;
void setMaxConcurrentWritingTask(int,int stream_idx = 0);
private:
CtSaving(const CtSaving&);
};
......@@ -46,4 +46,7 @@ using namespace lima;
void getOpenTime (double& shut_open_time /Out/) const;
void setCloseTime(double shut_close_time);
void getCloseTime(double& shut_close_time /Out/) const;
private:
CtShutter(const CtShutter&);
};
......@@ -142,6 +142,9 @@ using namespace lima;
// --- video mode
void getSupportedVideoMode(std::list<VideoMode> &modeList /Out/) const;
private:
CtVideo(const CtVideo&);
};
%MappedType CtVideo::AutoGainModeList
......
......@@ -315,7 +315,7 @@ void CtHwBinRoiFlip::setRoi(Roi& roi, bool round)
if (roi.isEmpty())
THROW_CTL_ERROR(InvalidValue) << "Hardware roi is empty";
if (!m_max_roi.containsRoi(roi))
THROW_CTL_ERROR(InvalidValue) << "Roi out of limts";
THROW_CTL_ERROR(InvalidValue) << "Roi out of limits";
if (!m_has_roi) {
if (!round)
......
Subproject commit 18aa2a93f2484a07f4ada559f7fdfbcc53d37a0c
Subproject commit 29f7612c2972acb1c5bc0c911d905d70ada77c6a
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