Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
Lima
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
65
Issues
65
List
Boards
Labels
Service Desk
Milestones
Jira
Jira
Merge Requests
6
Merge Requests
6
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
LimaGroup
Lima
Commits
bebd0423
Commit
bebd0423
authored
Feb 22, 2021
by
Samuel Debionne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update sip and build for Python 3.8
parent
4c85e405
Pipeline
#41955
failed with stages
in 7 minutes and 51 seconds
Changes
16
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
45 additions
and
18 deletions
+45
-18
conda/debug/bld.bat
conda/debug/bld.bat
+1
-1
conda/debug/build.sh
conda/debug/build.sh
+1
-1
conda/debug/conda_build_config.yaml
conda/debug/conda_build_config.yaml
+1
-0
conda/debug/meta.yaml
conda/debug/meta.yaml
+3
-2
conda/release/bld.bat
conda/release/bld.bat
+1
-1
conda/release/build.sh
conda/release/build.sh
+1
-1
conda/release/conda_build_config.yaml
conda/release/conda_build_config.yaml
+1
-0
conda/release/meta.yaml
conda/release/meta.yaml
+3
-2
control/sip/CtAccumulation.sip
control/sip/CtAccumulation.sip
+3
-0
control/sip/CtAcquisition.sip
control/sip/CtAcquisition.sip
+3
-0
control/sip/CtBuffer.sip
control/sip/CtBuffer.sip
+4
-1
control/sip/CtEvent.sip
control/sip/CtEvent.sip
+11
-9
control/sip/CtImage.sip
control/sip/CtImage.sip
+3
-0
control/sip/CtSaving.sip
control/sip/CtSaving.sip
+3
-0
control/sip/CtShutter.sip
control/sip/CtShutter.sip
+3
-0
control/sip/CtVideo.sip
control/sip/CtVideo.sip
+3
-0
No files found.
conda/debug/bld.bat
View file @
bebd0423
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
...
...
conda/debug/build.sh
View file @
bebd0423
#!/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
conda/debug/conda_build_config.yaml
View file @
bebd0423
...
...
@@ -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
...
...
conda/debug/meta.yaml
View file @
bebd0423
...
...
@@ -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
...
...
conda/release/bld.bat
View file @
bebd0423
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
...
...
conda/release/build.sh
View file @
bebd0423
#!/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
conda/release/conda_build_config.yaml
View file @
bebd0423
...
...
@@ -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
...
...
conda/release/meta.yaml
View file @
bebd0423
...
...
@@ -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
...
...
control/sip/CtAccumulation.sip
View file @
bebd0423
...
...
@@ -105,4 +105,7 @@ public:
void registerThresholdCallback(ThresholdCallback &cb);
void unregisterThresholdCallback(ThresholdCallback &cb);
private:
CtAccumulation(const CtAccumulation&);
};
control/sip/CtAcquisition.sip
View file @
bebd0423
...
...
@@ -104,6 +104,9 @@ using namespace lima;
void getTriggerModeList(TrigModeList& modes /Out/) const;
bool isMonitorMode() const;
private:
CtAccumulation(const CtAccumulation&);
};
%MappedType CtAcquisition::AutoExposureModeList
...
...
control/sip/CtBuffer.sip
View file @
bebd0423
...
...
@@ -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&);
};
control/sip/CtEvent.sip
View file @
bebd0423
...
...
@@ -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&);
};
control/sip/CtImage.sip
View file @
bebd0423
...
...
@@ -149,4 +149,7 @@ using namespace lima;
void getRotation(RotationMode &rotation /Out/) const;
void reset();
private:
CtImage(const CtImage&);
};
control/sip/CtSaving.sip
View file @
bebd0423
...
...
@@ -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&);
};
control/sip/CtShutter.sip
View file @
bebd0423
...
...
@@ -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&);
};
control/sip/CtVideo.sip
View file @
bebd0423
...
...
@@ -142,6 +142,9 @@ using namespace lima;
// --- video mode
void getSupportedVideoMode(std::list<VideoMode> &modeList /Out/) const;
private:
CtVideo(const CtVideo&);
};
%MappedType CtVideo::AutoGainModeList
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment