Add new comprehensive requirements-all.txt, and fix some syntax error…

…s found in static analysis.

AFL/automation/instrument/CDSAXSLabview.py

@@ -113,7 +113,8 @@ def measureTransmission(self,exp=5,fn='trans',set_empty_transmission=False,retur
  
 
 
-        '''with (LabviewConnection() if lv is None else lv) as lv:
+        '''
+        with (LabviewConnection() if lv is None else lv) as lv:
             self.status_txt = 'Moving beamstop out for transmission...'
             self.moveAxis(self.config['nmc_beamstop_out'],block=True,lv=lv)
             self.moveAxis(self.config['nmc_sample_out'],block=True,lv=lv)

AFL/automation/instrument/PySpecClient.py

@@ -1,4 +1,4 @@
-import numpy as np
+import numpy as np
 from pyspec.client.SpecConnection import SpecConnection
 from pyspec.client.SpecCounter import SpecCounter
 from pyspec.client.SpecConnectionsManager import SpecConnectionsManager

requirements-all.txt

@@ -0,0 +1,47 @@
+alphashape==1.3.1
+bokeh==3.5.1
+fabio==2024.4.0
+Flask==2.2.5
+Flask_Cors==4.0.1
+Flask_JWT_Extended==4.6.0
+gpflow==2.9.2
+h5py==3.11.0
+ipython==8.12.3
+ipython==8.26.0
+ipywidgets==8.1.3
+mantid==0.0.1
+matplotlib==3.9.1.post1
+nice==1.1
+numpy==2.0.1
+opentrons==7.5.0
+pandas==2.2.2
+paramiko==3.4.0
+periodictable==1.7.1
+Pillow==10.4.0
+Pint==0.24.3
+plotly==5.23.0
+pyFAI==2024.5.0
+pyparsing==3.1.2
+pyserial==3.5
+pyspec==0.2-r213
+pytest==8.3.2
+pywin32==306
+Requests==2.32.3
+sans==1.2.3
+sasdata==0.8.1
+sasmodels==1.0.7
+scikit_learn==1.5.1
+scipy==1.14.0
+seabreeze==2.9.2
+setuptools==72.1.0
+setuptools==68.2.0
+Shapely==2.0.5
+six==1.16.0
+skimage==0.0
+tensorflow==2.17.0
+test_common==1.3.0.post3
+tiled==0.1.0b6
+tqdm==4.66.5
+Werkzeug==3.0.3
+xarray==2024.7.0
+zeroconf==0.132.2