Skip to content

Commit a2c940c

Browse files
committed
Merge #74: Update requirements, specifically the btchip-python req
4c810a6 Use Ubuntu 22.04 (Fuzzbawls) bf9d8c4 Update requirements, specifically the btchip-python req (Fuzzbawls) Pull request description: Updates requirements ACKs for top commit: 4c810a6 Liquid369: ACK 4c810a6 Tree-SHA512: 61e02cdb4300d796b646605fd6d4b70c422150d7932caf681a6907f8b991802c21839069e4fa2f1e3c2f538cab2ecc9c71b37179e6301c675513aadee1cf418d
2 parents 90ae32d + 4c810a6 commit a2c940c

File tree

2 files changed

+12
-20
lines changed

2 files changed

+12
-20
lines changed

.github/workflows/main.yaml

+3-17
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request]
44
jobs:
55
lint:
66
name: Lint
7-
runs-on: ubuntu-20.04
7+
runs-on: ubuntu-22.04
88
defaults:
99
run:
1010
shell: bash
@@ -21,14 +21,8 @@ jobs:
2121

2222
- name: Install Dependencies
2323
run: |
24-
pip install pip==24.0
25-
pip install wheel==0.35.0
26-
pip install setuptools==53.0.0
2724
pip install -r requirements.txt
28-
pip install importlib-metadata==4.13.0
29-
pip install flake8==3.8.4
3025
pip install mypy==0.781
31-
pip install vulture==2.3
3226
3327
- name: Lint
3428
run: |
@@ -48,12 +42,12 @@ jobs:
4842
matrix:
4943
config:
5044
- name: Linux
51-
os: ubuntu-20.04
45+
os: ubuntu-22.04
5246
cachepath: ~/.cache/pip
5347
packages: libusb-1.0-0-dev libudev-dev
5448

5549
- name: macOS
56-
os: macos-12
50+
os: macos-13
5751
cachepath: ~/Library/Caches/pip
5852

5953
- name: Windows
@@ -80,15 +74,7 @@ jobs:
8074
sudo apt-get update
8175
sudo apt-get install --no-install-recommends --no-upgrade -qq ${{ matrix.config.packages }}
8276
fi
83-
if [[ ${{ matrix.config.os }} = windows* ]]; then
84-
python.exe -m pip install pip==24.0
85-
else
86-
pip install pip==24.0
87-
fi
88-
pip install wheel==0.35.0
89-
pip install setuptools==53.0.0
9077
pip install -r requirements.txt
91-
pip install pyinstaller
9278
- name: Build
9379
run: |
9480
pyinstaller SecurePivxMasternodeTool.spec

requirements.txt

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1-
wheel==0.35.0
2-
setuptools==53.0.0
1+
wheel==0.45.1
2+
setuptools==75.8.0
33
python-bitcoinrpc==1.0
44
bitcoin==1.1.42
5-
btchip-python==0.1.27
65
trezor==0.11.5
76
PyQt5>=5.15.10
87
requests==2.32.2
98
simplejson==3.19.2
109
ecdsa==0.19.0
10+
importlib-metadata==4.13.0
11+
flake8==3.8.4
12+
vulture==2.3
13+
pyinstaller==6.12.0
14+
# btchip-python 0.1.32 with a patch to fix a malformed dependency
15+
# See https://github.com/LedgerHQ/btchip-python/pull/54
16+
https://github.com/PIVX-Project/btchip-python/archive/e13eab8b0e665bdc23ac4b3890d2a5742303c421.tar.gz

0 commit comments

Comments
 (0)