From 8208563ff346ee9adb588d0f5f9826819bf56075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20M=C3=BCller?= <zarath@gmx.de>
Date: Mon, 10 Jan 2022 16:49:25 +0100
Subject: [PATCH] Modified deps/workflows

 - setup.cfg should now work flowlessly with fedoro 36 (#456)
 - github actions are updated to use more current software versions
---
 .github/workflows/release_linux.yml |  6 +++---
 .github/workflows/release_macos.yml |  6 +++---
 .github/workflows/release_win.yml   |  6 +++---
 requirements.txt                    |  8 ++++----
 setup.cfg                           | 10 +++++-----
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/release_linux.yml b/.github/workflows/release_linux.yml
index b3665ed..697b56a 100644
--- a/.github/workflows/release_linux.yml
+++ b/.github/workflows/release_linux.yml
@@ -15,12 +15,12 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.9
+        python-version: 3.10
     - name: Install dependencies and pyinstall
       run: |
-        python -m pip install --upgrade pip setuptools
+        python -m pip install pip==21.3.1 setuptools==60.5.0
         pip install -r requirements.txt
-        pip install PyInstaller==4.5.1
+        pip install PyInstaller==4.8
     - name: Build binary
       run: |
         pyinstaller --onefile -n nanovna-saver nanovna-saver.py
diff --git a/.github/workflows/release_macos.yml b/.github/workflows/release_macos.yml
index 83a5976..34ba7a6 100644
--- a/.github/workflows/release_macos.yml
+++ b/.github/workflows/release_macos.yml
@@ -15,12 +15,12 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.9
+        python-version: 3.10
     - name: Install dependencies and pyinstall
       run: |
-        python -m pip install --upgrade pip setuptools
+        python -m pip install pip==21.3.1 setuptools==60.5.0
         pip install -r requirements.txt
-        pip install PyInstaller==4.5.1
+        pip install PyInstaller==4.8
     - name: Build binary
       run: |
         pyinstaller --onefile -n nanovna-saver nanovna-saver.py
diff --git a/.github/workflows/release_win.yml b/.github/workflows/release_win.yml
index 7dd7daa..04229c7 100644
--- a/.github/workflows/release_win.yml
+++ b/.github/workflows/release_win.yml
@@ -18,13 +18,13 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.9
+        python-version: 3.10
         architecture: ${{ matrix.arch }}
     - name: Install dependencies and pyinstall
       run: |
-        python -m pip install --upgrade pip setuptools
+        python -m pip install pip==21.3.1 setuptools==60.5.0
         pip install -r requirements.txt
-        pip install PyInstaller==4.7
+        pip install PyInstaller==4.8
     - name: Build binary
       run: |
         pyinstaller --onefile -n nanovna-saver.exe nanovna-saver.py
diff --git a/requirements.txt b/requirements.txt
index 1c49ba0..e8f4bce 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 pyserial==3.5
-PyQt5==5.15.4
-numpy==1.21.1
-scipy==1.7.1
-cython==0.29.24
+PyQt5==5.15.6
+numpy==1.22.0
+scipy==1.7.3
+Cython==0.29.26
diff --git a/setup.cfg b/setup.cfg
index 646e60b..c534321 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,11 +15,11 @@ version = attr: NanoVNASaver.About.VERSION
 [options]
 packages = find_namespace:
 install_requires=
-    pyserial==3.5
-    PyQt5==5.15.4
-    numpy==1.21.1
-    scipy==1.7.1
-    cython==0.29.24
+    pyserial>=3.5
+    PyQt5>=5.15.0
+    numpy>=1.21.1
+    scipy>=1.7.1
+    Cython>=0.29.24
 python_requires = >=3.8, <4
 
 [options.entry_points]