Bugfix/exec crash (#678)

* fixed crash on pop-menu #677
* updated libs
pull/687/head v0.6.3
Holger Müller 2023-11-14 18:04:18 +01:00 zatwierdzone przez GitHub
rodzic 96dd23211a
commit d3216d2ddb
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
9 zmienionych plików z 27 dodań i 19 usunięć

Wyświetl plik

@ -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

Wyświetl plik

@ -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

Wyświetl plik

@ -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: |

Wyświetl plik

@ -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

Wyświetl plik

@ -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

Wyświetl plik

@ -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()

Wyświetl plik

@ -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(

Wyświetl plik

@ -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)

Wyświetl plik

@ -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 (