Commit bebd0423 authored by Samuel Debionne's avatar Samuel Debionne

Update sip and build for Python 3.8

parent 4c85e405
Pipeline #41955 failed with stages
in 7 minutes and 51 seconds
cmake -Bbuild -H. -G "%CMAKE_GENERATOR%" -DLIMA_BUILD_SUBMODULES=0 -DLIMA_ENABLE_PYTHON=1 -DLIMA_ENABLE_TESTS=1 -DLIMA_ENABLE_DEBUG=1 -DLIMA_ENABLE_CONFIG=1 -DLIMA_ENABLE_TIFF=1 -DLIMA_ENABLE_HDF5=1 -DLIMA_ENABLE_HDF5_BS=1 -DLIMA_ENABLE_EDFGZ=1 -DLIMA_ENABLE_EDFLZ4=1 -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% -DPYTHON_SITE_PACKAGES_DIR=%SP_DIR% -DCMAKE_FIND_ROOT_PATH=%LIBRARY_PREFIX%
cmake -Bbuild -H. -G "Ninja" -DLIMA_BUILD_SUBMODULES=0 -DLIMA_ENABLE_PYTHON=1 -DLIMA_ENABLE_TESTS=1 -DLIMA_ENABLE_DEBUG=1 -DLIMA_ENABLE_CONFIG=1 -DLIMA_ENABLE_TIFF=1 -DLIMA_ENABLE_HDF5=1 -DLIMA_ENABLE_HDF5_BS=1 -DLIMA_ENABLE_EDFGZ=1 -DLIMA_ENABLE_EDFLZ4=1 -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% -DPYTHON_SITE_PACKAGES_DIR=%SP_DIR% -DCMAKE_FIND_ROOT_PATH=%LIBRARY_PREFIX%
IF %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
cmake --build build --config Debug --target install
......
#!/bin/bash
cmake -Bbuild -H. -DLIMA_BUILD_SUBMODULES=0 -DLIMA_ENABLE_PYTHON=1 -DLIMA_ENABLE_TESTS=1 -DLIMA_ENABLE_DEBUG=1 -DLIMA_ENABLE_CONFIG=1 -DLIMA_ENABLE_TIFF=1 -DLIMA_ENABLE_HDF5=1 -DLIMA_ENABLE_HDF5_BS=1 -DLIMA_ENABLE_EDFGZ=1 -DLIMA_ENABLE_EDFLZ4=1 -DLIMA_ENABLE_CBF=1 -DLIMA_ENABLE_NUMA=1 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PREFIX -DPYTHON_SITE_PACKAGES_DIR=$SP_DIR -DCMAKE_FIND_ROOT_PATH=$PREFIX -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY
cmake -Bbuild -H. -G "Ninja" -DLIMA_BUILD_SUBMODULES=0 -DLIMA_ENABLE_PYTHON=1 -DLIMA_ENABLE_TESTS=1 -DLIMA_ENABLE_DEBUG=1 -DLIMA_ENABLE_CONFIG=1 -DLIMA_ENABLE_TIFF=1 -DLIMA_ENABLE_HDF5=1 -DLIMA_ENABLE_HDF5_BS=1 -DLIMA_ENABLE_EDFGZ=1 -DLIMA_ENABLE_EDFLZ4=1 -DLIMA_ENABLE_CBF=1 -DLIMA_ENABLE_NUMA=1 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PREFIX -DPYTHON_SITE_PACKAGES_DIR=$SP_DIR -DCMAKE_FIND_ROOT_PATH=$PREFIX -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY
cmake --build build --target install
......@@ -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
......@@ -34,10 +34,11 @@ requirements:
build:
- git
- cmake
- ninja
- {{ compiler('cxx') }}
run:
- python
- sip >=4.19.4, <=4.19.8 # For compatibility with pyqt 5.9.2
- sip
- {{ pin_compatible('processlib', max_pin='x.x') }}
- libconfig 1.7*
# I/O formats
......
cmake -Bbuild -H. -G "%CMAKE_GENERATOR%" -DLIMA_BUILD_SUBMODULES=0 -DLIMA_ENABLE_PYTHON=1 -DLIMA_ENABLE_TESTS=1 -DLIMA_ENABLE_DEBUG=1 -DLIMA_ENABLE_CONFIG=1 -DLIMA_ENABLE_TIFF=1 -DLIMA_ENABLE_HDF5=1 -DLIMA_ENABLE_HDF5_BS=1 -DLIMA_ENABLE_EDFGZ=1 -DLIMA_ENABLE_EDFLZ4=1 -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% -DPYTHON_SITE_PACKAGES_DIR=%SP_DIR% -DCMAKE_FIND_ROOT_PATH=%LIBRARY_PREFIX%
cmake -Bbuild -H. -G "Ninja" -DLIMA_BUILD_SUBMODULES=0 -DLIMA_ENABLE_PYTHON=1 -DLIMA_ENABLE_TESTS=1 -DLIMA_ENABLE_DEBUG=1 -DLIMA_ENABLE_CONFIG=1 -DLIMA_ENABLE_TIFF=1 -DLIMA_ENABLE_HDF5=1 -DLIMA_ENABLE_HDF5_BS=1 -DLIMA_ENABLE_EDFGZ=1 -DLIMA_ENABLE_EDFLZ4=1 -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% -DPYTHON_SITE_PACKAGES_DIR=%SP_DIR% -DCMAKE_FIND_ROOT_PATH=%LIBRARY_PREFIX%
IF %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
cmake --build build --config RelWithDebInfo --target install
......
#!/bin/bash
cmake -Bbuild -H. -DLIMA_BUILD_SUBMODULES=0 -DLIMA_ENABLE_PYTHON=1 -DLIMA_ENABLE_TESTS=1 -DLIMA_ENABLE_DEBUG=1 -DLIMA_ENABLE_CONFIG=1 -DLIMA_ENABLE_TIFF=1 -DLIMA_ENABLE_HDF5=1 -DLIMA_ENABLE_HDF5_BS=1 -DLIMA_ENABLE_EDFGZ=1 -DLIMA_ENABLE_EDFLZ4=1 -DLIMA_ENABLE_CBF=1 -DLIMA_ENABLE_NUMA=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=$PREFIX -DPYTHON_SITE_PACKAGES_DIR=$SP_DIR -DCMAKE_FIND_ROOT_PATH=$PREFIX -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY
cmake -Bbuild -H. -G "Ninja" -DLIMA_BUILD_SUBMODULES=0 -DLIMA_ENABLE_PYTHON=1 -DLIMA_ENABLE_TESTS=1 -DLIMA_ENABLE_DEBUG=1 -DLIMA_ENABLE_CONFIG=1 -DLIMA_ENABLE_TIFF=1 -DLIMA_ENABLE_HDF5=1 -DLIMA_ENABLE_HDF5_BS=1 -DLIMA_ENABLE_EDFGZ=1 -DLIMA_ENABLE_EDFLZ4=1 -DLIMA_ENABLE_CBF=1 -DLIMA_ENABLE_NUMA=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=$PREFIX -DPYTHON_SITE_PACKAGES_DIR=$SP_DIR -DCMAKE_FIND_ROOT_PATH=$PREFIX -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY
cmake --build build --target install
......@@ -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
......@@ -32,10 +32,11 @@ requirements:
build:
- git
- cmake
- ninja
- {{ compiler('cxx') }}
run:
- python
- sip >=4.19.4, <=4.19.8 # For compatibility with pyqt 5.9.2
- sip
- {{ pin_compatible('processlib', max_pin='x.x') }}
- libconfig 1.7*
# I/O formats
......
......@@ -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:
CtAccumulation(const CtAccumulation&);
};
%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
......
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