Skip to content

Commit 5007d5d

Browse files
authored
Merge pull request #21 from valory-xyz/fix/linter-errors
Fix/linter errors
2 parents 11ca958 + 2fdb044 commit 5007d5d

10 files changed

Lines changed: 2571 additions & 959 deletions

File tree

.github/workflows/main_workflow.yml

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414

1515
strategy:
1616
matrix:
17-
os: [ ubuntu-latest, macos-latest, windows-latest ]
18-
python-version: [ "3.10" ]
17+
os: [ ubuntu-latest, macos-latest-large, windows-latest ]
18+
python-version: [ "3.14" ]
1919
poetry-version: ["1.3.2"]
2020

2121
timeout-minutes: 10
@@ -41,7 +41,7 @@ jobs:
4141
strategy:
4242
matrix:
4343
os: [ ubuntu-latest ]
44-
python-version: [ "3.10" ]
44+
python-version: [ "3.14" ]
4545

4646
timeout-minutes: 30
4747

@@ -77,7 +77,7 @@ jobs:
7777
strategy:
7878
matrix:
7979
os: [ ubuntu-latest ]
80-
python-version: [ "3.10.6" ]
80+
python-version: [ "3.14" ]
8181

8282
timeout-minutes: 30
8383

@@ -129,7 +129,7 @@ jobs:
129129
- uses: actions/checkout@v3
130130
with:
131131
fetch-depth: 0
132-
- uses: actions/setup-go@v3
132+
- uses: actions/setup-go@v5
133133
with:
134134
go-version: "1.17.7"
135135
- run: |
@@ -148,8 +148,8 @@ jobs:
148148

149149
strategy:
150150
matrix:
151-
os: [ ubuntu-latest, macos-latest, windows-latest ]
152-
python-version: [ "3.8", "3.9", "3.10", "3.11" ]
151+
os: [ ubuntu-latest, macos-latest-large, windows-latest ]
152+
python-version: [ "3.10", "3.11", "3.12", "3.13", "3.14" ]
153153

154154
timeout-minutes: 30
155155

@@ -159,7 +159,7 @@ jobs:
159159
with:
160160
submodules: recursive
161161
python-version: ${{ matrix.python-version }}
162-
- uses: actions/setup-go@v3
162+
- uses: actions/setup-go@v5
163163
with:
164164
go-version: "1.17.7"
165165
- if: matrix.os == 'ubuntu-latest'
@@ -198,30 +198,32 @@ jobs:
198198
run: |
199199
tox -e py${{ matrix.python-version }}-linux -- -m 'not e2e'
200200
201-
- if: matrix.os == 'macos-latest'
202-
name: Install dependencies (macos-latest)
201+
- if: matrix.os == 'macos-latest-large'
202+
name: Install dependencies (macos-latest-large)
203203
run: |
204204
pip install tomte[tox]==0.6.2
205-
brew install gcc
206205
# brew install protobuf
207206
# brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/72457f0166d5619a83f508f2345b22d0617b5021/Formula/protobuf.rb
208-
wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-osx-x86_64.zip
209-
unzip protoc-3.19.4-osx-x86_64.zip -d protoc
210-
sudo mv protoc/bin/protoc /usr/local/bin/protoc
211-
brew tap yoheimuta/protolint
212-
brew install protolint
207+
wget https://github.com/protocolbuffers/protobuf/releases/download/v24.3/protoc-24.3-osx-x86_64.zip
208+
unzip protoc-24.3-osx-x86_64.zip -d protoc
209+
210+
# install protolint
211+
curl -L -o protolint.tar.gz https://github.com/yoheimuta/protolint/releases/download/v0.50.2/protolint_0.50.2_darwin_amd64.tar.gz
212+
tar -xzvf protolint.tar.gz
213+
sudo mv protolint /usr/local/bin/protolint
214+
sudo chmod +x /usr/local/bin/protolint
213215
214216
# install ipfs
215-
curl -O https://dist.ipfs.io/go-ipfs/v0.6.0/go-ipfs_v0.6.0_darwin-amd64.tar.gz
216-
tar -xvzf go-ipfs_v0.6.0_darwin-amd64.tar.gz
217+
curl -L -o ipfs.tar.gz https://github.com/ipfs/kubo/releases/download/v0.6.0/go-ipfs_v0.6.0_darwin-amd64.tar.gz
218+
tar -xvzf ipfs.tar.gz
217219
cd go-ipfs
218220
sudo ./install.sh
219221
cd ..
220222
rm -rf go-ipfs
221223
ipfs init
222224
223-
- if: matrix.os == 'macos-latest'
224-
name: Skills unit tests macos-latest
225+
- if: matrix.os == 'macos-latest-large'
226+
name: Framework unit tests macos-latest-large
225227
run: |
226228
tox -e py${{ matrix.python-version }}-darwin -- -m 'not e2e'
227229
@@ -232,22 +234,21 @@ jobs:
232234
run: |
233235
python -m pip install -U pip
234236
echo "::add-path::C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64"
237+
238+
choco source add -n chocolatey -s 'https://chocolatey.org/api/v2/'
239+
choco source enable -n chocolatey
240+
235241
choco install wget -y
236-
choco install protoc --version 3.19.4
242+
choco install protoc --version 24.3
237243
choco install mingw -y
238244
choco install make -y
239245
# to check make was installed
240246
make --version
241247
pip install tomte[tox]==0.6.2
242-
# wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-win64.zip
243-
# unzip protoc-3.19.4-win64.zip -d protoc
244-
# sudo mv protoc/bin/protoc /usr/local/bin/protoc
245-
246-
python scripts\update_symlinks_cross_platform.py
247248
248249
# install ipfs
249-
curl https://dist.ipfs.io/go-ipfs/v0.6.0/go-ipfs_v0.6.0_windows-amd64.zip -o go-ipfs_v0.6.0.zip
250-
Expand-Archive -Path go-ipfs_v0.6.0.zip -DestinationPath ~\Apps\
250+
curl -L -o go-ipfs.zip https://github.com/ipfs/kubo/releases/download/v0.6.0/go-ipfs_v0.6.0_windows-amd64.zip
251+
Expand-Archive -Path go-ipfs.zip -DestinationPath ~\Apps\
251252
cp ~\Apps\go-ipfs\ipfs.exe C:\Users\runneradmin\go\bin\
252253
ipfs init
253254
@@ -274,7 +275,7 @@ jobs:
274275
strategy:
275276
matrix:
276277
os: [ ubuntu-latest ]
277-
python-version: [ "3.10" ]
278+
python-version: [ "3.14" ]
278279
timeout-minutes: 30
279280
steps:
280281
- uses: actions/checkout@v3
@@ -313,4 +314,4 @@ jobs:
313314
314315
- name: e2e tests
315316
run: |
316-
tox -e py${{ matrix.python-version }} -- -m 'e2e'
317+
tox -e py${{ matrix.python-version }}-linux -- -m 'e2e'

0 commit comments

Comments
 (0)