Merge release-3.11

* origin/release-3.11:
  SINQ: Added setup for mobile andor CCD camera and added startup setting polariser
  REQUIREMENTS: Expanded the bandwith of allowed p4p versions
Change-Id: I159c50869ddfbfa33f25c770989610a181c8e5c4

nicos_sinq/amor/setups/andorccd.py

@@ -0,0 +1,51 @@
+description = 'Setup for the ANDOR CCD camera at AMOR using the CCDWWW server without counter box'
+
+excludes = ['detector', 'detector_mon']
+
+devices = dict(
+    ccdwww_connector = device('nicos_sinq.boa.devices.ccdwww.CCDWWWConnector',
+        description = 'Connector for CCDWWW',
+        baseurl = 'http://mpc2704:8080/ccd',
+        base64auth = 'xxx',
+        byteorder = 'big',
+        comdelay = 1.,
+        comtries = 5,
+    ),
+    ccdwww = device('nicos_sinq.boa.devices.ccdwww.AndorCCD',
+        description = 'CCDWWW image channel',
+        iscontroller = True,
+        connector = 'ccdwww_connector',
+        shape = (1024, 1024),
+        pollinterval = None,
+        maxage = 30,
+    ),
+    ccd_cooler = device('nicos_sinq.boa.devices.ccdwww.CCDCooler',
+        description = 'CCD sensor cooler',
+        connector = 'ccdwww_connector',
+        unit = 'state',
+        pollinterval = None,
+        maxage = 30,
+        fmtstr = '%s'
+    ),
+    cooler_temperature = device('nicos.devices.generic.paramdev.ReadonlyParamDevice',
+        description = 'Actual temperature reading',
+        device = 'ccd_cooler',
+        parameter = 'temperature',
+    ),
+    andorccd_det = device('nicos.devices.generic.Detector',
+        description = 'Dummy detector to encapsulate ccdwww',
+        monitors = [
+            'ccdwww',
+        ],
+        timers = [
+            'ccdwww',
+        ],
+        images = [
+            'ccdwww',
+        ],
+    ),
+)
+
+startupcode = '''
+SetDetectors(andorccd_det)
+'''

nicos_sinq/amor/setups/polariser.py

@@ -43,7 +43,6 @@
         readpv = 'SQ:AMOR:pico:FREQ_RBV',
         abslimits = (0, 300000),
         precision = 1,
-        target = 140201,
         visibility = ('metadata', 'namespace'),
     ),
     spin_selection = device('nicos.devices.generic.switcher.Switcher',
@@ -60,3 +59,7 @@
         visibility = ('devlist', 'metadata', 'namespace'),
     ),
 )
+
+startupcode = '''
+spinflipper_freq.start(140200)
+'''

requirements-epics.txt

@@ -1,3 +1,3 @@
 caproto>=0.8.1;platform_machine!='arm64'
-p4p==4.0.0;platform_machine!='arm64'
+p4p>=4.0.0,<=4.2.0;platform_machine!='arm64'
 pyepics>=3.2.4;platform_machine!='arm64'