From 9dc409ec9ed98e8968acaec3e790da1c6f8a08a1 Mon Sep 17 00:00:00 2001
From: Liquid369 <45834289+Liquid369@users.noreply.github.com>
Date: Sat, 20 Jul 2024 09:23:18 -0500
Subject: [PATCH] Update deps Bump runners to python 3.10 Update a few more
 deps Use old resolver for btchip=python bad metadata Use on all installs Test
 different setuptools Update requirements.txt Update requirements.txt Remove
 wheel update Update requirements.txt Update requirements.txt Update main.yaml
 Update requirements.txt Update main.yaml Update requirements.txt

---
 .github/workflows/main.yaml | 24 +++++++++++++-----------
 requirements.txt            | 13 +++++++------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 49664d6..806b91b 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -17,16 +17,17 @@ jobs:
       - name: Initialize Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: '3.10'
 
       - name: Install Dependencies
         run: |
-          python -m pip install --upgrade wheel
-          pip install -r requirements.txt
-          pip install importlib-metadata==4.13.0
-          pip install flake8==3.8.4
-          pip install mypy==0.781
-          pip install vulture==2.3
+          pip install git+https://github.com/EchterAgo/btchip-python.git@fix_deps
+          pip install wheel==0.38.4 --use-deprecated=legacy-resolver
+          pip install -r requirements.txt --use-deprecated=legacy-resolver
+          pip install importlib-metadata==4.13.0 --use-deprecated=legacy-resolver
+          pip install flake8==3.8.4 --use-deprecated=legacy-resolver
+          pip install mypy==0.781 --use-deprecated=legacy-resolver
+          pip install vulture==2.3 --use-deprecated=legacy-resolver
 
       - name: Lint
         run: |
@@ -64,7 +65,7 @@ jobs:
       - name: Setup Python 3.7
         uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: '3.10'
       - name: Setup pip cache
         uses: actions/cache@v3
         with:
@@ -78,9 +79,10 @@ jobs:
             sudo apt-get update
             sudo apt-get install --no-install-recommends --no-upgrade -qq ${{ matrix.config.packages }}
           fi
-          python -m pip install --upgrade wheel
-          pip install -r requirements.txt
-          pip install pyinstaller
+          pip install git+https://github.com/EchterAgo/btchip-python.git@fix_deps
+          pip install wheel==0.38.4 --use-deprecated=legacy-resolver
+          pip install -r requirements.txt --use-deprecated=legacy-resolver
+          pip install pyinstaller --use-deprecated=legacy-resolver
       - name: Build
         run: |
           pyinstaller specPet4l.spec
diff --git a/requirements.txt b/requirements.txt
index 7050742..2e214a8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,9 @@
 python-bitcoinrpc==1.0
 bitcoin==1.1.42
-btchip-python==0.1.27
-trezor==0.11.3
-PyQt5>=5.9,<5.14.1
-requests>=2.18.4,<=2.23
-simplejson<=3.13.2
-ecdsa==0.13.3
+trezor==0.11.1
+PyQt5>=5.15.10
+requests==2.32.2
+simplejson==3.19.2
+ecdsa==0.19.0
+wheel==0.38.1
+setuptools==64