Commit 458515ba authored by Samuel Debionne's avatar Samuel Debionne
Browse files

Update sip and build for Python 3.8

parent 91246039
......@@ -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
......
......@@ -13,14 +13,14 @@ build:
requirements:
host:
- python {{ python }}
- sip 4.19.8 # For compatibility with pyqt 5.9.2
- sip
- lima-core
build:
- cmake
- {{ 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('lima-core', max_pin='x.x') }}
test:
......
......@@ -47,6 +47,9 @@ class DetInfoCtrlObj : HwDetInfoCtrlObj
HwMaxImageSizeCallback& cb);
virtual void unregisterMaxImageSizeCallback(
HwMaxImageSizeCallback& cb);
private:
DetInfoCtrlObj(const DetInfoCtrlObj&);
};
class SyncCtrlObj : HwSyncCtrlObj
......@@ -72,9 +75,10 @@ class SyncCtrlObj : HwSyncCtrlObj
virtual void setNbHwFrames(int nb_frames);
virtual void getNbHwFrames(int& nb_frames /Out/);
virtual void getValidRanges(HwSyncCtrlObj::ValidRangesType&
valid_ranges /Out/);
virtual void getValidRanges(HwSyncCtrlObj::ValidRangesType& valid_ranges /Out/);
private:
SyncCtrlObj(const SyncCtrlObj&);
};
......@@ -92,6 +96,8 @@ class BinCtrlObj : HwBinCtrlObj
virtual void getBin(Bin& bin /Out/);
virtual void checkBin(Bin& bin /In,Out/);
private:
BinCtrlObj(const BinCtrlObj&);
};
......@@ -115,6 +121,8 @@ class Interface : HwInterface
virtual void getStatus(HwInterface::StatusType& status /Out/);
virtual int getNbHwAcquiredFrames();
private:
Interface(const Interface&);
};
};
Supports Markdown
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