Skip to content

Commit

Permalink
Bugfix/exec crash (#678)
Browse files Browse the repository at this point in the history
* fixed crash on pop-menu #677
* updated libs
  • Loading branch information
zarath authored Nov 14, 2023
1 parent 96dd232 commit d3216d2
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release_macos_app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
14 changes: 10 additions & 4 deletions .github/workflows/release_win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 7 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/NanoVNASaver/Charts/RI.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
2 changes: 1 addition & 1 deletion src/NanoVNASaver/Charts/RIMu.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion src/NanoVNASaver/Charts/RIZ.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/NanoVNASaver/Charts/TDR.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down

0 comments on commit d3216d2

Please sign in to comment.