- update libs

- makes polyfit work for profiles containing error values

src/artisanlib/main.py

@@ -32606,8 +32606,13 @@ def doPolyfit(self):
             start = 0
         startindex = aw.qmc.time2index(starttime + start)
         endindex = min(l,aw.qmc.time2index(endtime + start))
-        z = aw.qmc.polyfit(self.curves[self.c1ComboBox.currentIndex()],self.curves[self.c2ComboBox.currentIndex()],
-           self.polyfitdeg.value(),startindex,endindex,self.deltacurves[self.c2ComboBox.currentIndex()])
+        c1 = [numpy.nan if x == -1 else x for x in self.curves[self.c1ComboBox.currentIndex()] ]
+        c1 = numpy.array(c1,dtype='float64')
+        c2 = [numpy.nan if x == -1 else x for x in self.curves[self.c2ComboBox.currentIndex()] ]
+        c2 = numpy.array(c2,dtype='float64')
+        idx = numpy.isfinite(c1) & numpy.isfinite(c2)
+        z = aw.qmc.polyfit(c1[idx], c2[idx], # c1,c2,
+               self.polyfitdeg.value(),startindex,endindex,self.deltacurves[self.c2ComboBox.currentIndex()])
         res = True
         if z is not None:
             for e in z:

src/requirements-linux.txt

@@ -1,13 +1,13 @@
 gevent==1.4.0
 gevent-websocket==0.10.1
-numpy==1.17.4 # 1.16.4
+numpy==1.18.0 # 1.17.4
 colorspacious==1.1.2
-scipy==1.3.1
+scipy==1.4.1 # 1.3.1
 matplotlib==3.1.2
 PyQt5==5.13.2
-openpyxl==3.0.0
+openpyxl==3.0.2
 pyinstaller==3.5
 #jeepney==0.4
 #cryptography==2.6.1
-keyring==19.2.0
+keyring==19.2.0  # builds with 19.3.0 and 20.0.0 fail with py2app/pyinstaller
 SecretStorage==3.1.1

src/requirements-osx.txt

@@ -4,12 +4,12 @@ pyobjc-framework-Cocoa==6.1
 py2app==0.19
 gevent==1.4.0
 gevent-websocket==0.10.1
-numpy==1.17.4 #1.16.4 #1.15.4 # 1.16.2 fails on TravisCI; py2app fails with 1.16.5, 1.17.0-2
+numpy==1.18.0 # 1.17.4 # 1.16.2 fails on TravisCI; py2app fails with 1.16.5, 1.17.0-2
 colorspacious==1.1.2
-scipy==1.3.2
+scipy==1.4.1 # 1.3.2
 matplotlib==3.1.2
 PyQt5==5.13.1 # py2app 0.18 builds made with PyQt5.13.2 fail to show window content
-openpyxl==3.0.0
-keyring==19.2.0
+openpyxl==3.0.2
+keyring==19.2.0 # builds with 19.3.0 and 20.0.0 fail with py2app/pyinstaller
 darkdetect==0.1.1 # detect if dark mode is active
 

src/requirements-rpi.txt

@@ -5,13 +5,13 @@
 # websocket has to be requested after the pywheel version of gevent)
 gevent==1.4.0
 gevent-websocket==0.10.1
-numpy==1.17.4  # 1.16.4
+numpy==1.18.0 #1.17.4
 colorspacious==1.1.2 # depends on numpy thus needs to be put after
-scipy==1.3.2
+scipy==1.3.3 # 1.3.2
 matplotlib==3.0.3 # 3.1.x requires Python 3.7, stretch comes with Python 3.5.3 only
 openpyxl==2.6.4 # openpyxl >=3.0.0 requires Python >=3.6 while TravisCI RPi runs still on 3.5.3
 #PyQt 5.7.1 is preinstalled
 pyinstaller==3.3.1 # 3.5 seems to hang!?
 cffi==1.12.3 # 1.13.2 fails, 1.12.3 is needed by crypto v2.5
 cryptography==2.5 # 2.8 fails with libcrypto.so.1.1: version `OPENSSL_1_1_0j' not found, required by cryptography.hazmat.bindings._openssl.so
-keyring==19.2.0
+keyring==19.2.0  # builds with 19.3.0 and 20.0.0 fail with py2app/pyinstaller

src/requirements-win.txt

@@ -1,11 +1,11 @@
 gevent==1.4.0
 gevent-websocket==0.10.1
-numpy==1.17.4 # 1.16.4
+numpy==1.18.0 # 1.17.4
 colorspacious==1.1.2
-scipy==1.3.1 # 1.3.2 breaks pyinstaller due to different shared lib location
+scipy==1.4.1 # 1.3.1 # 1.3.2 breaks pyinstaller due to different shared lib location
 matplotlib==3.1.2
 PyQt5==5.13.2
-openpyxl==3.0.0
+openpyxl==3.0.2
 pyinstaller==3.5
 pywin32==225
-keyring==19.2.0
+keyring==19.2.0 # builds with 19.3.0 and 20.0.0 fail with py2app/pyinstaller

src/requirements.txt

@@ -1,18 +1,18 @@
 pyserial==3.4
-pymodbus==2.3.0 #2.2.0
+pymodbus==2.3.0
 unidecode==1.1.1
-bottle==0.12.17
+bottle==0.12.18
 qrcode==6.1
 requests==2.22.0
-yoctopuce==1.10.37304
+yoctopuce==1.10.38545
 pefile==2019.4.18
 altgraph==0.16.1
 macholib==1.11
 python-snap7==0.10
 pyusb==1.0.2
-setuptools==41.4.0
+setuptools==42.0.2
 persist-queue==0.5.0
 portalocker==1.5.2
 prettytable==0.7.2
-Phidget22==1.5.20191106
+Phidget22==1.5.20191113
 natsort==6.2.0

src/setup-mac3.py

@@ -273,6 +273,11 @@
     # cannot be run brew as root thus the folllowing does not work
     # subprocess.check_call(r'cp $(brew list libusb | grep libusb-1.0.0.dylib) Artisan.app/Contents/Frameworks/libusb-1.0.dylib',shell = True)
 
+# you need to do a 
+#
+#  # brew install libusb
+#
+# to get libusb installed
 try:
     subprocess.check_call(r'cp /usr/local/Cellar/libusb/1.0.23/lib/libusb-1.0.0.dylib Artisan.app/Contents/Frameworks/libusb-1.0.dylib',shell = True)
 except Exception as e: