kopia lustrzana https://github.com/NanoVNA-Saver/nanovna-saver
rodzic
96dd23211a
commit
d3216d2ddb
|
@ -28,9 +28,9 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
python3.11 -m venv build
|
python3.11 -m venv build
|
||||||
. build/bin/activate
|
. 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 -r requirements.txt
|
||||||
pip install PyInstaller==5.13.0
|
pip install PyInstaller==6.2.0
|
||||||
- name: Build binary
|
- name: Build binary
|
||||||
run: |
|
run: |
|
||||||
. build/bin/activate
|
. build/bin/activate
|
|
@ -20,9 +20,9 @@ jobs:
|
||||||
python-version: 3.11
|
python-version: 3.11
|
||||||
- name: Install dependencies and pyinstall
|
- name: Install dependencies and pyinstall
|
||||||
run: |
|
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 -r requirements.txt
|
||||||
pip install PyInstaller==5.13.0
|
pip install PyInstaller==6.2.0
|
||||||
- name: Build binary
|
- name: Build binary
|
||||||
run: |
|
run: |
|
||||||
python setup.py -V
|
python setup.py -V
|
||||||
|
|
|
@ -25,9 +25,9 @@ jobs:
|
||||||
|
|
||||||
- name: Install dependencies and pyinstall
|
- name: Install dependencies and pyinstall
|
||||||
run: |
|
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 -r requirements.txt
|
||||||
pip install PyInstaller==5.13.0
|
pip install PyInstaller==6.2.0
|
||||||
|
|
||||||
- name: Build binary
|
- name: Build binary
|
||||||
run: |
|
run: |
|
||||||
|
|
|
@ -24,12 +24,18 @@ jobs:
|
||||||
architecture: ${{ matrix.arch }}
|
architecture: ${{ matrix.arch }}
|
||||||
- name: Install dependencies and pyinstall
|
- name: Install dependencies and pyinstall
|
||||||
run: |
|
run: |
|
||||||
pip install -U pip setuptools setuptools-scm
|
python3 -m venv venv
|
||||||
pip install -r requirements.txt
|
.\venv\Scripts\activate
|
||||||
pip install PyInstaller==5.13.0
|
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
|
- name: Build binary
|
||||||
run: |
|
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
|
pyinstaller --onefile --noconsole -i icon_48x48.ico -p src -n nanovna-saver.exe nanovna-saver.py
|
||||||
- name: Archive production artifacts
|
- name: Archive production artifacts
|
||||||
uses: actions/upload-artifact@v1
|
uses: actions/upload-artifact@v1
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
pyserial==3.5
|
pyserial==3.5
|
||||||
PyQt6==6.5.2
|
PyQt6==6.5.2
|
||||||
numpy==1.25.1
|
PyQt6-sip==13.6.0
|
||||||
scipy==1.11.1
|
sip==6.7.12
|
||||||
Cython==3.0.0
|
numpy==1.26.2
|
||||||
setuptools==68.0.0
|
scipy==1.11.3
|
||||||
setuptools-scm==7.1.0
|
Cython==3.0.5
|
||||||
|
setuptools==68.2.2
|
||||||
|
setuptools-scm==8.0.4
|
||||||
|
|
|
@ -514,7 +514,7 @@ class RealImaginaryChart(FrequencyChart):
|
||||||
self.action_set_fixed_maximum_imag.setText(
|
self.action_set_fixed_maximum_imag.setText(
|
||||||
f"Maximum jX ({self.maxDisplayImag})"
|
f"Maximum jX ({self.maxDisplayImag})"
|
||||||
)
|
)
|
||||||
self.menu.exec_(event.globalPos())
|
self.menu.exec(event.globalPos())
|
||||||
|
|
||||||
def value(self, p: Datapoint) -> complex:
|
def value(self, p: Datapoint) -> complex:
|
||||||
raise NotImplementedError()
|
raise NotImplementedError()
|
||||||
|
|
|
@ -140,7 +140,7 @@ class RealImaginaryMuChart(RealImaginaryChart):
|
||||||
self.action_set_fixed_maximum_imag.setText(
|
self.action_set_fixed_maximum_imag.setText(
|
||||||
f"Maximum {MU}'' ({self.maxDisplayImag})"
|
f"Maximum {MU}'' ({self.maxDisplayImag})"
|
||||||
)
|
)
|
||||||
self.menu.exec_(event.globalPos())
|
self.menu.exec(event.globalPos())
|
||||||
|
|
||||||
def setCoreLength(self):
|
def setCoreLength(self):
|
||||||
val, selected = QtWidgets.QInputDialog.getDouble(
|
val, selected = QtWidgets.QInputDialog.getDouble(
|
||||||
|
|
|
@ -107,7 +107,7 @@ class RealImaginaryZChart(RealImaginaryChart):
|
||||||
self.action_set_fixed_maximum_imag.setText(
|
self.action_set_fixed_maximum_imag.setText(
|
||||||
f"Maximum jX ({self.maxDisplayImag})"
|
f"Maximum jX ({self.maxDisplayImag})"
|
||||||
)
|
)
|
||||||
self.menu.exec_(event.globalPos())
|
self.menu.exec(event.globalPos())
|
||||||
|
|
||||||
def value(self, p: Datapoint) -> complex:
|
def value(self, p: Datapoint) -> complex:
|
||||||
return self.impedance(p)
|
return self.impedance(p)
|
||||||
|
|
|
@ -163,7 +163,7 @@ class TDRChart(Chart):
|
||||||
self.y_action_set_fixed_maximum.setText(
|
self.y_action_set_fixed_maximum.setText(
|
||||||
f"Maximum ({self.maxImpedance})"
|
f"Maximum ({self.maxImpedance})"
|
||||||
)
|
)
|
||||||
self.menu.exec_(event.globalPos())
|
self.menu.exec(event.globalPos())
|
||||||
|
|
||||||
def isPlotable(self, x, y):
|
def isPlotable(self, x, y):
|
||||||
return (
|
return (
|
||||||
|
|
Ładowanie…
Reference in New Issue