kopia lustrzana https://github.com/NanoVNA-Saver/nanovna-saver
Feature/python3 11 (#576)
* updated requirements * use python3.11 in release actions * fixed np.complex deprecationpull/577/head
rodzic
f6e1868a95
commit
74d3ac7d07
|
@ -23,9 +23,9 @@ jobs:
|
|||
run: |
|
||||
python3.9 -m venv build
|
||||
. build/bin/activate
|
||||
python -m pip install pip==22.2.2 setuptools==65.3.0
|
||||
python -m pip install pip==22.3.1 setuptools==65.6.3
|
||||
pip install -r requirements.txt
|
||||
pip install PyInstaller==5.4.1
|
||||
pip install PyInstaller==5.7.0
|
||||
- name: Build binary
|
||||
run: |
|
||||
. build/bin/activate
|
||||
|
|
|
@ -15,17 +15,18 @@ jobs:
|
|||
uses: actions/checkout@v2
|
||||
- name: Install python
|
||||
run: |
|
||||
sudo add-apt-repository ppa:deadsnakes/ppa
|
||||
sudo apt-get update
|
||||
sudo apt install -y python3.10 python3-pip python3.10-venv \
|
||||
python3.10-dev \
|
||||
sudo apt install -y python3.11 python3-pip python3.11-venv \
|
||||
python3.11-dev \
|
||||
python3-pyqt5
|
||||
- name: Install dependencies and pyinstall
|
||||
run: |
|
||||
python3.10 -m venv build
|
||||
python3.11 -m venv build
|
||||
. build/bin/activate
|
||||
python -m pip install pip==22.2.2 setuptools==65.3.0
|
||||
python -m pip install pip==22.3.1 setuptools==65.6.3
|
||||
pip install -r requirements.txt
|
||||
pip install PyInstaller==5.4.1
|
||||
pip install PyInstaller==5.7.0
|
||||
- name: Build binary
|
||||
run: |
|
||||
. build/bin/activate
|
||||
|
|
|
@ -15,12 +15,12 @@ jobs:
|
|||
- name: Set up Python
|
||||
uses: actions/setup-python@v2
|
||||
with:
|
||||
python-version: 3.9
|
||||
python-version: 3.11
|
||||
- name: Install dependencies and pyinstall
|
||||
run: |
|
||||
python -m pip install pip==22.2.2 setuptools==65.3.0
|
||||
python -m pip install pip==22.3.1 setuptools==65.6.3
|
||||
pip install -r requirements.txt
|
||||
pip install PyInstaller==5.4.1
|
||||
pip install PyInstaller==5.7.0
|
||||
- name: Build binary
|
||||
run: |
|
||||
pyinstaller --onefile -n nanovna-saver nanovna-saver.py
|
||||
|
|
|
@ -18,13 +18,13 @@ jobs:
|
|||
- name: Set up Python
|
||||
uses: actions/setup-python@v2
|
||||
with:
|
||||
python-version: 3.9
|
||||
python-version: 3.11
|
||||
architecture: ${{ matrix.arch }}
|
||||
- name: Install dependencies and pyinstall
|
||||
run: |
|
||||
python -m pip install pip==22.2.2 setuptools==65.3.0
|
||||
python -m pip install pip==22.3.1 setuptools==65.6.3
|
||||
pip install -r requirements.txt
|
||||
pip install PyInstaller==5.4.1
|
||||
pip install PyInstaller==5.7.0
|
||||
- name: Build binary
|
||||
run: |
|
||||
pyinstaller --onefile -n nanovna-saver.exe nanovna-saver.py
|
||||
|
|
|
@ -132,7 +132,7 @@ class TDRWindow(QtWidgets.QWidget):
|
|||
logger.info("Cannot compute cable length at 0 span")
|
||||
return
|
||||
|
||||
s11 = [np.complex(d.re, d.im) for d in self.app.data.s11]
|
||||
s11 = [complex(d.re, d.im) for d in self.app.data.s11]
|
||||
window = np.blackman(len(self.app.data.s11))
|
||||
|
||||
windowed_s11 = window * s11
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
pyserial==3.5
|
||||
PyQt5==5.15.7
|
||||
numpy==1.23.5
|
||||
numpy==1.24.1
|
||||
scipy==1.9.3
|
||||
Cython==0.29.32
|
||||
|
|
Ładowanie…
Reference in New Issue