Commit 0b8bc25a authored by Alejandro Homs Puron's avatar Alejandro Homs Puron Committed by operator for beamline
Browse files

Update sip and build for Python 3.8

parent 48cae25f
......@@ -5,8 +5,8 @@ c_compiler:
cxx_compiler:
- vs2017 # [win]
python:
- 3.6
- 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 compatibility with pyqt 5.9.2
- sip >=4.19.20* # API v12.7
- lima-core
- libnuma
- libpng
......@@ -28,7 +28,7 @@ requirements:
- {{ compiler('cxx') }}
run:
- python {{ python }}
- sip >=4.19.4, <=4.19.8 # For compatibility with pyqt 5.9.2
- {{ pin_compatible('sip', min_pin='x.x.x', max_pin='x') }}
- libpng
- libnuma
- {{ pin_compatible('lima-core', max_pin='x.x') }}
......
......@@ -43,6 +43,9 @@ class BebFpgaMem
unsigned long read(unsigned long addr);
void write(unsigned long addr, unsigned long val);
private:
BebFpgaMem(const SlsDetector::BebFpgaMem& o);
};
......
......@@ -40,7 +40,7 @@ public:
private:
BufferMgr(Camera *cam);
BufferMgr(const BufferMgr& o);
};
......
......@@ -190,7 +190,6 @@ class SystemCmd
{
public:
SystemCmd(std::string cmd, std::string desc = "", bool try_sudo = true);
SystemCmd(const SlsDetector::SystemCmd& o);
static void setUseSudo(bool use_sudo);
static bool getUseSudo();
......@@ -203,6 +202,9 @@ public:
%End
int execute();
private:
SystemCmd(const SlsDetector::SystemCmd& o);
};
class CPUAffinity
......
......@@ -36,6 +36,9 @@ class EventCallback : EventCallback
protected:
virtual void processEvent(Event *event);
private:
EventCallback(const SlsDetector::EventCallback& o);
};
......@@ -65,6 +68,9 @@ class DetInfoCtrlObj : HwDetInfoCtrlObj
HwMaxImageSizeCallback& cb);
virtual void unregisterMaxImageSizeCallback(
HwMaxImageSizeCallback& cb);
private:
DetInfoCtrlObj(const SlsDetector::DetInfoCtrlObj& o);
};
......@@ -94,6 +100,8 @@ class SyncCtrlObj : HwSyncCtrlObj
virtual void getValidRanges(HwSyncCtrlObj::ValidRangesType& valid_ranges /Out/);
private:
SyncCtrlObj(const SlsDetector::SyncCtrlObj& o);
};
......
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