From 5fa22db9c224cd6d837acecf8732bc3ff5ad9d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Tue, 31 Oct 2023 14:09:53 +0100 Subject: [PATCH 01/18] fixed crash on pop-menu #677 --- src/NanoVNASaver/Charts/RI.py | 2 +- src/NanoVNASaver/Charts/RIMu.py | 2 +- src/NanoVNASaver/Charts/RIZ.py | 2 +- src/NanoVNASaver/Charts/TDR.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/NanoVNASaver/Charts/RI.py b/src/NanoVNASaver/Charts/RI.py index 2690e22b..719bbd71 100644 --- a/src/NanoVNASaver/Charts/RI.py +++ b/src/NanoVNASaver/Charts/RI.py @@ -514,7 +514,7 @@ def contextMenuEvent(self, event): self.action_set_fixed_maximum_imag.setText( f"Maximum jX ({self.maxDisplayImag})" ) - self.menu.exec_(event.globalPos()) + self.menu.exec(event.globalPos()) def value(self, p: Datapoint) -> complex: raise NotImplementedError() diff --git a/src/NanoVNASaver/Charts/RIMu.py b/src/NanoVNASaver/Charts/RIMu.py index 321855a7..9d2df12a 100644 --- a/src/NanoVNASaver/Charts/RIMu.py +++ b/src/NanoVNASaver/Charts/RIMu.py @@ -140,7 +140,7 @@ def contextMenuEvent(self, event): self.action_set_fixed_maximum_imag.setText( f"Maximum {MU}'' ({self.maxDisplayImag})" ) - self.menu.exec_(event.globalPos()) + self.menu.exec(event.globalPos()) def setCoreLength(self): val, selected = QtWidgets.QInputDialog.getDouble( diff --git a/src/NanoVNASaver/Charts/RIZ.py b/src/NanoVNASaver/Charts/RIZ.py index f1a810e4..370cd71b 100644 --- a/src/NanoVNASaver/Charts/RIZ.py +++ b/src/NanoVNASaver/Charts/RIZ.py @@ -107,7 +107,7 @@ def contextMenuEvent(self, event): self.action_set_fixed_maximum_imag.setText( f"Maximum jX ({self.maxDisplayImag})" ) - self.menu.exec_(event.globalPos()) + self.menu.exec(event.globalPos()) def value(self, p: Datapoint) -> complex: return self.impedance(p) diff --git a/src/NanoVNASaver/Charts/TDR.py b/src/NanoVNASaver/Charts/TDR.py index 0f8794c4..a56faace 100644 --- a/src/NanoVNASaver/Charts/TDR.py +++ b/src/NanoVNASaver/Charts/TDR.py @@ -163,7 +163,7 @@ def contextMenuEvent(self, event): self.y_action_set_fixed_maximum.setText( f"Maximum ({self.maxImpedance})" ) - self.menu.exec_(event.globalPos()) + self.menu.exec(event.globalPos()) def isPlotable(self, x, y): return ( From 2be01f94e98db6c71989f78a26f1b88156918ac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Thu, 2 Nov 2023 17:45:13 +0100 Subject: [PATCH 02/18] bugfix for chart crashes with pop-ups --- .../{release_linux_modern.yml => release_linux.yml} | 4 ++-- .github/workflows/release_macos.yml | 4 ++-- .github/workflows/release_macos_app.yml | 4 ++-- .github/workflows/release_win.yml | 2 +- requirements.txt | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) rename .github/workflows/{release_linux_modern.yml => release_linux.yml} (91%) diff --git a/.github/workflows/release_linux_modern.yml b/.github/workflows/release_linux.yml similarity index 91% rename from .github/workflows/release_linux_modern.yml rename to .github/workflows/release_linux.yml index 76e562e4..4bba1e87 100644 --- a/.github/workflows/release_linux_modern.yml +++ b/.github/workflows/release_linux.yml @@ -28,9 +28,9 @@ jobs: run: | python3.11 -m venv build . build/bin/activate - python -m pip install pip==23.2.1 setuptools==68.0.0 + python -m pip install pip==23.3.1 setuptools==68.2.2 pip install -r requirements.txt - pip install PyInstaller==5.13.0 + pip install PyInstaller==6.1.0 - name: Build binary run: | . build/bin/activate diff --git a/.github/workflows/release_macos.yml b/.github/workflows/release_macos.yml index 60b602b7..154d6dd7 100644 --- a/.github/workflows/release_macos.yml +++ b/.github/workflows/release_macos.yml @@ -20,9 +20,9 @@ jobs: python-version: 3.11 - name: Install dependencies and pyinstall run: | - python -m pip install pip==23.2.1 setuptools==68.0.0 + python -m pip install pip==23.3.1 setuptools==68.2.2 pip install -r requirements.txt - pip install PyInstaller==5.13.0 + pip install PyInstaller==6.1.0 - name: Build binary run: | python setup.py -V diff --git a/.github/workflows/release_macos_app.yml b/.github/workflows/release_macos_app.yml index fb28a2cd..94c52673 100644 --- a/.github/workflows/release_macos_app.yml +++ b/.github/workflows/release_macos_app.yml @@ -25,9 +25,9 @@ jobs: - name: Install dependencies and pyinstall run: | - python -m pip install pip==23.2.1 setuptools==68.0.0 + python -m pip install pip==23.3.1 setuptools==68.2.2 pip install -r requirements.txt - pip install PyInstaller==5.13.0 + pip install PyInstaller==6.1.0 - name: Build binary run: | diff --git a/.github/workflows/release_win.yml b/.github/workflows/release_win.yml index aa208260..d3e6fd80 100644 --- a/.github/workflows/release_win.yml +++ b/.github/workflows/release_win.yml @@ -26,7 +26,7 @@ jobs: run: | pip install -U pip setuptools setuptools-scm pip install -r requirements.txt - pip install PyInstaller==5.13.0 + pip install PyInstaller==6.1.0 - name: Build binary run: | python setup.py -V diff --git a/requirements.txt b/requirements.txt index 2a1c2942..6d9c9149 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ pyserial==3.5 -PyQt6==6.5.2 -numpy==1.25.1 -scipy==1.11.1 -Cython==3.0.0 -setuptools==68.0.0 +PyQt6==6.5.3 +numpy==1.26.1 +scipy==1.11.3 +Cython==3.0.5 +setuptools==68.2.2 setuptools-scm==7.1.0 From 60d51a78a2907cad1588784b0df156c1faf0189e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Thu, 2 Nov 2023 18:13:54 +0100 Subject: [PATCH 03/18] updated requirements --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 6d9c9149..3e6150ea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ pyserial==3.5 PyQt6==6.5.3 +PyQt6-sip==13.6.0 numpy==1.26.1 scipy==1.11.3 Cython==3.0.5 From d60c4dcda89cd61522c9141c2974ce1d9e166ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Fri, 3 Nov 2023 14:37:55 +0100 Subject: [PATCH 04/18] test venv build --- .github/workflows/release_win.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release_win.yml b/.github/workflows/release_win.yml index d3e6fd80..8c68a7f4 100644 --- a/.github/workflows/release_win.yml +++ b/.github/workflows/release_win.yml @@ -24,11 +24,14 @@ jobs: architecture: ${{ matrix.arch }} - name: Install dependencies and pyinstall run: | + python3 -m venv venv + . venv/bin/activate pip install -U pip setuptools setuptools-scm pip install -r requirements.txt pip install PyInstaller==6.1.0 - name: Build binary run: | + . venv/bin/activate python setup.py -V pyinstaller --onefile --noconsole -i icon_48x48.ico -p src -n nanovna-saver.exe nanovna-saver.py - name: Archive production artifacts From 19d30067e6bd2c4bb0fdef17d935f04d41d91626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Fri, 3 Nov 2023 14:43:17 +0100 Subject: [PATCH 05/18] venv --- .github/workflows/release_win.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_win.yml b/.github/workflows/release_win.yml index 8c68a7f4..d309c7f3 100644 --- a/.github/workflows/release_win.yml +++ b/.github/workflows/release_win.yml @@ -25,13 +25,13 @@ jobs: - name: Install dependencies and pyinstall run: | python3 -m venv venv - . venv/bin/activate + .\venv\Scripts\activate pip install -U pip setuptools setuptools-scm pip install -r requirements.txt pip install PyInstaller==6.1.0 - name: Build binary run: | - . venv/bin/activate + .\venv\Scripts\activate python setup.py -V pyinstaller --onefile --noconsole -i icon_48x48.ico -p src -n nanovna-saver.exe nanovna-saver.py - name: Archive production artifacts From 3dee033c6671ab92960d98b361311ae4aa8617cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Fri, 3 Nov 2023 15:07:42 +0100 Subject: [PATCH 06/18] pyqt6.sip hacks --- .github/workflows/release_win.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release_win.yml b/.github/workflows/release_win.yml index d309c7f3..c60ec573 100644 --- a/.github/workflows/release_win.yml +++ b/.github/workflows/release_win.yml @@ -29,6 +29,8 @@ jobs: pip install -U pip setuptools setuptools-scm pip install -r requirements.txt pip install PyInstaller==6.1.0 + pip uninstall pyqt6-sip + pip install pyqt6-sip - name: Build binary run: | .\venv\Scripts\activate From e514665f92dd609abdcabbc9a46a310c9a935098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Fri, 3 Nov 2023 15:14:00 +0100 Subject: [PATCH 07/18] narf --- .github/workflows/release_win.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release_win.yml b/.github/workflows/release_win.yml index c60ec573..c5368038 100644 --- a/.github/workflows/release_win.yml +++ b/.github/workflows/release_win.yml @@ -29,7 +29,7 @@ jobs: pip install -U pip setuptools setuptools-scm pip install -r requirements.txt pip install PyInstaller==6.1.0 - pip uninstall pyqt6-sip + pip uninstall -y pyqt6-sip pip install pyqt6-sip - name: Build binary run: | From b4f4fac417cdea37b0d96c1dc379638621f04342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Fri, 3 Nov 2023 15:22:42 +0100 Subject: [PATCH 08/18] more verbose install --- .github/workflows/release_win.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release_win.yml b/.github/workflows/release_win.yml index c5368038..282f3cf1 100644 --- a/.github/workflows/release_win.yml +++ b/.github/workflows/release_win.yml @@ -26,15 +26,16 @@ jobs: run: | python3 -m venv venv .\venv\Scripts\activate - pip install -U pip setuptools setuptools-scm - pip install -r requirements.txt - pip install PyInstaller==6.1.0 - pip uninstall -y pyqt6-sip - pip install pyqt6-sip + python3 -m pip install pip==23.3.1 + python3 -m pip install -U setuptools setuptools-scm + python3 -m pip install -r requirements.txt + python3 -m pip install PyInstaller==6.1.0 + python3 -m pip uninstall -y pyqt6-sip + python3 -m pip install pyqt6-sip - name: Build binary run: | .\venv\Scripts\activate - python setup.py -V + python3 setup.py -V pyinstaller --onefile --noconsole -i icon_48x48.ico -p src -n nanovna-saver.exe nanovna-saver.py - name: Archive production artifacts uses: actions/upload-artifact@v1 From eea80db1ea0df375eb979bd7f6c6e96177eae2e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Fri, 3 Nov 2023 15:41:45 +0100 Subject: [PATCH 09/18] bla --- .github/workflows/release_win.yml | 2 -- requirements.txt | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/release_win.yml b/.github/workflows/release_win.yml index 282f3cf1..d150c762 100644 --- a/.github/workflows/release_win.yml +++ b/.github/workflows/release_win.yml @@ -30,8 +30,6 @@ jobs: python3 -m pip install -U setuptools setuptools-scm python3 -m pip install -r requirements.txt python3 -m pip install PyInstaller==6.1.0 - python3 -m pip uninstall -y pyqt6-sip - python3 -m pip install pyqt6-sip - name: Build binary run: | .\venv\Scripts\activate diff --git a/requirements.txt b/requirements.txt index 3e6150ea..5f3583c7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ pyserial==3.5 -PyQt6==6.5.3 -PyQt6-sip==13.6.0 +PyQt6==6.5.2 numpy==1.26.1 scipy==1.11.3 Cython==3.0.5 From 04d4359f972a07a3374b94e54b316c8f2c4e2877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Sat, 4 Nov 2023 08:35:50 +0100 Subject: [PATCH 10/18] old versions test --- requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5f3583c7..2a1c2942 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ pyserial==3.5 PyQt6==6.5.2 -numpy==1.26.1 -scipy==1.11.3 -Cython==3.0.5 -setuptools==68.2.2 +numpy==1.25.1 +scipy==1.11.1 +Cython==3.0.0 +setuptools==68.0.0 setuptools-scm==7.1.0 From cb162c58fa417a36a40261f5192d287be650a33b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Sat, 4 Nov 2023 09:23:05 +0100 Subject: [PATCH 11/18] old pyinstaller --- .github/workflows/release_win.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release_win.yml b/.github/workflows/release_win.yml index d150c762..078cd69b 100644 --- a/.github/workflows/release_win.yml +++ b/.github/workflows/release_win.yml @@ -29,7 +29,7 @@ jobs: python3 -m pip install pip==23.3.1 python3 -m pip install -U setuptools setuptools-scm python3 -m pip install -r requirements.txt - python3 -m pip install PyInstaller==6.1.0 + python3 -m pip install PyInstaller==5.13.0 - name: Build binary run: | .\venv\Scripts\activate From e3e2ec8d67a409790a0127a88349c207734bdd77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Tue, 14 Nov 2023 10:38:49 +0100 Subject: [PATCH 12/18] newer PyInstaller --- .github/workflows/release_linux.yml | 2 +- .github/workflows/release_macos.yml | 2 +- .github/workflows/release_macos_app.yml | 2 +- .github/workflows/release_win.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release_linux.yml b/.github/workflows/release_linux.yml index 4bba1e87..8f6f21d0 100644 --- a/.github/workflows/release_linux.yml +++ b/.github/workflows/release_linux.yml @@ -30,7 +30,7 @@ jobs: . build/bin/activate python -m pip install pip==23.3.1 setuptools==68.2.2 pip install -r requirements.txt - pip install PyInstaller==6.1.0 + pip install PyInstaller==6.2.0 - name: Build binary run: | . build/bin/activate diff --git a/.github/workflows/release_macos.yml b/.github/workflows/release_macos.yml index 154d6dd7..d0a7e3d8 100644 --- a/.github/workflows/release_macos.yml +++ b/.github/workflows/release_macos.yml @@ -22,7 +22,7 @@ jobs: run: | python -m pip install pip==23.3.1 setuptools==68.2.2 pip install -r requirements.txt - pip install PyInstaller==6.1.0 + pip install PyInstaller==6.2.0 - name: Build binary run: | python setup.py -V diff --git a/.github/workflows/release_macos_app.yml b/.github/workflows/release_macos_app.yml index 94c52673..4f8f27ce 100644 --- a/.github/workflows/release_macos_app.yml +++ b/.github/workflows/release_macos_app.yml @@ -27,7 +27,7 @@ jobs: run: | python -m pip install pip==23.3.1 setuptools==68.2.2 pip install -r requirements.txt - pip install PyInstaller==6.1.0 + pip install PyInstaller==6.2.0 - name: Build binary run: | diff --git a/.github/workflows/release_win.yml b/.github/workflows/release_win.yml index 078cd69b..bf85cba8 100644 --- a/.github/workflows/release_win.yml +++ b/.github/workflows/release_win.yml @@ -29,7 +29,7 @@ jobs: python3 -m pip install pip==23.3.1 python3 -m pip install -U setuptools setuptools-scm python3 -m pip install -r requirements.txt - python3 -m pip install PyInstaller==5.13.0 + python3 -m pip install PyInstaller==6.2.0 - name: Build binary run: | .\venv\Scripts\activate From 59af809e9b206255fafc098e156c45b31a66ccdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Tue, 14 Nov 2023 10:42:45 +0100 Subject: [PATCH 13/18] updated libs --- requirements.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 2a1c2942..4247d00e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ pyserial==3.5 PyQt6==6.5.2 -numpy==1.25.1 -scipy==1.11.1 -Cython==3.0.0 -setuptools==68.0.0 -setuptools-scm==7.1.0 +numpy==1.26.2 +scipy==1.11.3 +Cython==3.0.5 +setuptools==68.2.2 +setuptools-scm==8.0.4 From 632eb3dcf46728e52be92de56fdc4aedaf315193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Tue, 14 Nov 2023 11:01:39 +0100 Subject: [PATCH 14/18] uninstall install sip --- .github/workflows/release_win.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release_win.yml b/.github/workflows/release_win.yml index bf85cba8..3c757748 100644 --- a/.github/workflows/release_win.yml +++ b/.github/workflows/release_win.yml @@ -30,6 +30,8 @@ jobs: python3 -m pip install -U setuptools setuptools-scm python3 -m pip install -r requirements.txt python3 -m pip install PyInstaller==6.2.0 + python3 -m pip uninstall PyQt6-sip + python3 -m pip install PyQt6-sip==13.0.6 - name: Build binary run: | .\venv\Scripts\activate From 1df7dd368f5669b58aa7dd9df57322f43d9926e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Tue, 14 Nov 2023 11:08:07 +0100 Subject: [PATCH 15/18] test --- .github/workflows/release_win.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_win.yml b/.github/workflows/release_win.yml index 3c757748..f39dd5b7 100644 --- a/.github/workflows/release_win.yml +++ b/.github/workflows/release_win.yml @@ -30,8 +30,8 @@ jobs: python3 -m pip install -U setuptools setuptools-scm python3 -m pip install -r requirements.txt python3 -m pip install PyInstaller==6.2.0 - python3 -m pip uninstall PyQt6-sip - python3 -m pip install PyQt6-sip==13.0.6 + python3 -m pip uninstall -r PyQt6-sip + python3 -m pip install PyQt6-sip==13.6.0 - name: Build binary run: | .\venv\Scripts\activate From 4af70dbf9c43ac48b6ec76ae7857f1299492dd4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Tue, 14 Nov 2023 11:13:12 +0100 Subject: [PATCH 16/18] grrr --- .github/workflows/release_win.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release_win.yml b/.github/workflows/release_win.yml index f39dd5b7..59c8268e 100644 --- a/.github/workflows/release_win.yml +++ b/.github/workflows/release_win.yml @@ -30,7 +30,7 @@ jobs: python3 -m pip install -U setuptools setuptools-scm python3 -m pip install -r requirements.txt python3 -m pip install PyInstaller==6.2.0 - python3 -m pip uninstall -r PyQt6-sip + python3 -m pip uninstall -y PyQt6-sip python3 -m pip install PyQt6-sip==13.6.0 - name: Build binary run: | From 09454f54500a2671ff842736ff756aeed477b94a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Tue, 14 Nov 2023 11:24:49 +0100 Subject: [PATCH 17/18] another try --- requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4247d00e..112d80ef 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,7 @@ pyserial==3.5 -PyQt6==6.5.2 +PyQt6-Qt6==6.5.2 +PyQt6-sip==13.6.0 +sip==6.7.12 numpy==1.26.2 scipy==1.11.3 Cython==3.0.5 From c1aed935c02840694e93487fc2d7df77ae23e242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Tue, 14 Nov 2023 11:32:43 +0100 Subject: [PATCH 18/18] hmpf --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 112d80ef..88fdca38 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ pyserial==3.5 -PyQt6-Qt6==6.5.2 +PyQt6==6.5.2 PyQt6-sip==13.6.0 sip==6.7.12 numpy==1.26.2