Skip to content

Commit

Permalink
Feature/python3 11 (#576)
Browse files Browse the repository at this point in the history
* updated requirements
* use python3.11 in release actions
* fixed np.complex deprecation
  • Loading branch information
zarath committed Jan 1, 2023
1 parent f6e1868 commit 74d3ac7
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/release_linux_modern.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release_win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion NanoVNASaver/Windows/TDR.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def updateTDR(self):
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
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 74d3ac7

Please sign in to comment.