Commit 5e7807c1 authored by Samuel Debionne's avatar Samuel Debionne

Update sip and build for Python 3.8

parent eb32f09e
Pipeline #42062 passed with stages
in 24 minutes and 35 seconds
......@@ -28,3 +28,4 @@ CMakeFiles/
cmake_install.cmake
scripts/config.txt
build/
build-msvc/
Subproject commit 5d49b912412e132d8627f492fb47594b56fd6644
Subproject commit f361d516c780e0fdfbb128afb8dcf97cc86ceb50
Subproject commit 7e3e3acbdf2237a7a291682da803fd487e2a2d4f
Subproject commit 826a4795eace6d3ae89d7168944a78d214785801
Subproject commit 56e707dd76a0f132e3beae0566edd428352ab4df
Subproject commit f81766ff658c34df2d72652f8fdde8c6b1c2ec9b
Subproject commit 5752bfcadec54e10edfe5aa2196e3b895abbfcb7
Subproject commit 6c20b48bb71460aadc83092d9eb69ea08c1eea2b
Subproject commit cbc66dcacb2a4da9f84138b55b1e49554be8610e
Subproject commit a16be1482718c3d6f0173acb89b312aee7f211a6
Subproject commit 85eef0e325eec3187e854b212057520826a76899
Subproject commit 54c7d0fcee9c98977af7ccbfdeb85fb5c9edbd29
Subproject commit ebfeb0f804e0bb49abed521e8483795b304023aa
Subproject commit 036f4a7b7b501e4d28efee9afcb7025c1da8889e
Subproject commit add903c12c3d94d10eea7b11b61d4c0be9dbf0bc
Subproject commit cad5ae24af0758f26f3f3777fc0b5c06b5a97c04
Subproject commit 678c958a9590f46cc3b90a12eb21b028bbb1dd98
Subproject commit 129a908d1c7cee9e58b3e83922863b483ec4e404
Subproject commit 6778e602556ef2bd09ab8ebf91976ebcf76cbb77
Subproject commit 63ba478a0648b35ee0300616e28f9f4b9c32541d
Subproject commit 344116d5dc96104da36a809fbcaa143b33824df2
Subproject commit 012e73d268ebc2f04a241acd71487bcdfdf02dba
Subproject commit 5087b404478ce4e8501102c74c912f6ed97069f8
Subproject commit c96eae11d6102c3814207729ea4f4bfe741fd571
Subproject commit 5b665266959431ae3239c608bb4913c51c81c074
Subproject commit 7d64a74242ff25d1c31ea3184bf5614361130ab4
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,15 +34,16 @@ requirements:
build:
- git
- cmake
- ninja
- {{ 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 +51,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
......
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,15 +32,16 @@ requirements:
build:
- git
- cmake
- ninja
- {{ 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 +49,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