From d3216d2ddbfa1d46eeec98fe55c5832270dc17e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20M=C3=BCller?= Date: Tue, 14 Nov 2023 18:04:18 +0100 Subject: [PATCH] Bugfix/exec crash (#678) * fixed crash on pop-menu #677 * updated libs --- ...{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 | 14 ++++++++++---- requirements.txt | 12 +++++++----- src/NanoVNASaver/Charts/RI.py | 2 +- src/NanoVNASaver/Charts/RIMu.py | 2 +- src/NanoVNASaver/Charts/RIZ.py | 2 +- src/NanoVNASaver/Charts/TDR.py | 2 +- 9 files changed, 27 insertions(+), 19 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 76e562e..8f6f21d 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.2.0 - name: Build binary run: | . build/bin/activate diff --git a/.github/workflows/release_macos.yml b/.github/workflows/release_macos.yml index 60b602b..d0a7e3d 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.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 fb28a2c..4f8f27c 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.2.0 - name: Build binary run: | diff --git a/.github/workflows/release_win.yml b/.github/workflows/release_win.yml index aa20826..59c8268 100644 --- a/.github/workflows/release_win.yml +++ b/.github/workflows/release_win.yml @@ -24,12 +24,18 @@ jobs: architecture: ${{ matrix.arch }} - name: Install dependencies and pyinstall run: | - pip install -U pip setuptools setuptools-scm - pip install -r requirements.txt - pip install PyInstaller==5.13.0 + python3 -m venv venv + .\venv\Scripts\activate + 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.2.0 + python3 -m pip uninstall -y PyQt6-sip + python3 -m pip install PyQt6-sip==13.6.0 - name: Build binary run: | - python setup.py -V + .\venv\Scripts\activate + 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 diff --git a/requirements.txt b/requirements.txt index 2a1c294..88fdca3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,9 @@ 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 +PyQt6-sip==13.6.0 +sip==6.7.12 +numpy==1.26.2 +scipy==1.11.3 +Cython==3.0.5 +setuptools==68.2.2 +setuptools-scm==8.0.4 diff --git a/src/NanoVNASaver/Charts/RI.py b/src/NanoVNASaver/Charts/RI.py index 2690e22..719bbd7 100644 --- a/src/NanoVNASaver/Charts/RI.py +++ b/src/NanoVNASaver/Charts/RI.py @@ -514,7 +514,7 @@ class RealImaginaryChart(FrequencyChart): 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 321855a..9d2df12 100644 --- a/src/NanoVNASaver/Charts/RIMu.py +++ b/src/NanoVNASaver/Charts/RIMu.py @@ -140,7 +140,7 @@ class RealImaginaryMuChart(RealImaginaryChart): 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 f1a810e..370cd71 100644 --- a/src/NanoVNASaver/Charts/RIZ.py +++ b/src/NanoVNASaver/Charts/RIZ.py @@ -107,7 +107,7 @@ class RealImaginaryZChart(RealImaginaryChart): 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 0f8794c..a56faac 100644 --- a/src/NanoVNASaver/Charts/TDR.py +++ b/src/NanoVNASaver/Charts/TDR.py @@ -163,7 +163,7 @@ class TDRChart(Chart): 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 (