fixes

myTonino · Aug 4, 2022 · 7853019 · 7853019
1 parent c57f3e5
commit 7853019
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 25 deletions.
diff --git a/src/lib/main.py b/src/lib/main.py
@@ -1937,22 +1937,6 @@ def closeEvent(self,event):
 aw = None # this is to ensure that the variable aw is already defined during application initialization
 
 
-try:
-    vv, _, _ = platform.mac_ver()
-    vv = vv.split('.')[:2]
-    major = int(vv[0])
-    minor = int(vv[1])
-    if major >= 10 and minor >= 10: #v >= 10.10:
-        # fix Mac OS X 10.10 (Yosemite) font issue
-        # https://bugreports.qt-project.org/browse/QTBUG-40833
-        QFont.insertSubstitution(".Helvetica Neue DeskInterface", "Helvetica Neue")
-    if major >= 10 and minor >= 9: #v >= 10.9:
-        # fix Mac OS X 10.9 (mavericks) font issue
-        # https://bugreports.qt-project.org/browse/QTBUG-32789
-        QFont.insertSubstitution(".Lucida Grande UI", "Lucida Grande")
-except Exception as es: # pylint: disable=broad-except
-    _log.exception(es)
-
 # define app
 args = sys.argv
 if sys.platform == 'linux' :

diff --git a/src/requirements-mac.txt b/src/requirements-mac.txt
@@ -1,6 +1,7 @@
 py2app==0.28.2
 pyserial==3.5
+pyyaml==6.0
 numpy==1.23.1
 scipy==1.8.1
-matplotlib==3.5.2
-PyQt6==6.3.1
+PyQt6==6.3.1
+matplotlib==3.5.2
diff --git a/src/requirements-win.txt b/src/requirements-win.txt
@@ -1,6 +1,7 @@
 pyinstaller==5.3
-pyserial==5.3
+pyserial==3.5
+pyyaml==6.0
 numpy==1.23.1
 scipy==1.8.1
-matplotlib==3.5.2
-PyQt6==6.3.1
+PyQt6==6.3.1
+matplotlib==3.5.2
diff --git a/src/setup-install3-pi.nsi b/src/setup-install3-pi.nsi
@@ -283,7 +283,18 @@ Section Uninstall
   RMDir /r "$INSTDIR\pytz"
   RMDir /r "$INSTDIR\qt5_plugins"
   RMDir /r "$INSTDIR\tcl"
-  RMDir /r "$INSTDIR\tk"
+  RMDir /r "$INSTDIR\tk"
+
+  RMDir /r "$INSTDIR\altgraph-0.17.2.dist-info"
+  RMDir /r "$INSTDIR\kiwisolver"
+  RMDir /r "$INSTDIR\matplotlib"
+  RMDir /r "$INSTDIR\numpy"
+  RMDir /r "$INSTDIR\PIL"
+  RMDir /r "$INSTDIR\pyinstaller-5.3.dist-info"
+  RMDir /r "$INSTDIR\PyQt6"
+  RMDir /r "$INSTDIR\scipy"
+  RMDir /r "$INSTDIR\setuptools-63.2.0.dist-info"
+  RMDir /r "$INSTDIR\yaml"
 
   RMDir "$SMPROGRAMS\${PRODUCT_NAME}"
   RMDir "$INSTDIR"

diff --git a/src/tonino-win.spec b/src/tonino-win.spec
@@ -4,13 +4,13 @@ block_cipher = None
 
 
 TONINO_SRC = r'C:\Users\luther\Desktop\tonino-src'
-PYTHON35 = r'C:\Program Files\Python35'
+PYTHON3 = r'C:\Program Files\Python310'
 NAME = 'tonino'
 
 ##
 TARGET = 'dist\\' + NAME + '\\'
-PYTHON_PACKAGES = PYTHON35 + r'\Lib\site-packages'
-PYQT_QT = PYTHON_PACKAGES + r'\PyQt5\Qt'
+PYTHON_PACKAGES = PYTHON3 + r'\Lib\site-packages'
+PYQT_QT = PYTHON_PACKAGES + r'\PyQt6\Qt'
 PYQT_QT_BIN = PYQT_QT + r'\bin'
 PYQT_QT_TRANSLATIONS = PYQT_QT + r'\translations'