From 0c179388d33f979de0e83263b9c9b2c333aaea57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20M=C3=BCller?= <zarath@gmx.de>
Date: Tue, 11 Jan 2022 17:22:33 +0100
Subject: [PATCH] Pyinstaller and numpy version fixes for binary builds

---
 .github/workflows/release_linux.yml | 2 +-
 .github/workflows/release_macos.yml | 4 ++--
 .github/workflows/release_win.yml   | 4 ++--
 _config.yml                         | 1 -
 requirements.txt                    | 2 +-
 setup.cfg                           | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)
 delete mode 100644 _config.yml

diff --git a/.github/workflows/release_linux.yml b/.github/workflows/release_linux.yml
index a2fb533..30e2cf0 100644
--- a/.github/workflows/release_linux.yml
+++ b/.github/workflows/release_linux.yml
@@ -20,7 +20,7 @@ jobs:
       run: |
         python -m pip install pip==21.3.1 setuptools==60.5.0
         pip install -r requirements.txt
-        pip install PyInstaller==4.8
+        pip install PyInstaller==4.7
     - 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 34ba7a6..4ae5df7 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.10
+        python-version: 3.9
     - name: Install dependencies and pyinstall
       run: |
         python -m pip install pip==21.3.1 setuptools==60.5.0
         pip install -r requirements.txt
-        pip install PyInstaller==4.8
+        pip install PyInstaller==4.7
     - 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 04229c7..e4adf46 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.10
+        python-version: 3.9
         architecture: ${{ matrix.arch }}
     - name: Install dependencies and pyinstall
       run: |
         python -m pip install pip==21.3.1 setuptools==60.5.0
         pip install -r requirements.txt
-        pip install PyInstaller==4.8
+        pip install PyInstaller==4.7
     - name: Build binary
       run: |
         pyinstaller --onefile -n nanovna-saver.exe nanovna-saver.py
diff --git a/_config.yml b/_config.yml
deleted file mode 100644
index 9da9a02..0000000
--- a/_config.yml
+++ /dev/null
@@ -1 +0,0 @@
-theme: jekyll-theme-dinky
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index e8f4bce..85c80a2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 pyserial==3.5
 PyQt5==5.15.6
-numpy==1.22.0
+numpy==1.21.5
 scipy==1.7.3
 Cython==0.29.26
diff --git a/setup.cfg b/setup.cfg
index c534321..1dde2fd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,7 +17,7 @@ packages = find_namespace:
 install_requires=
     pyserial>=3.5
     PyQt5>=5.15.0
-    numpy>=1.21.1
+    numpy>=1.21.1,<1.22.0
     scipy>=1.7.1
     Cython>=0.29.24
 python_requires = >=3.8, <4