Skip to content

Commit a399272

Browse files
Fix tomli import in binaries (#451)
* Upd pyinstaller to 6.11.1 * Fix tomli in pyinstaller * Add ubuntu import * Bump v3.0.1.rc2 * Add import for windows * Bump v3.0.1 * Bump version fix
1 parent f6782ea commit a399272

File tree

5 files changed

+51
-39
lines changed

5 files changed

+51
-39
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,14 @@ Head to [Usage](#usage) to launch your operator service.
154154
Pull the latest docker operator docker image:
155155

156156
```bash
157-
docker pull europe-west4-docker.pkg.dev/stakewiselabs/public/v3-operator:v3.0.0
157+
docker pull europe-west4-docker.pkg.dev/stakewiselabs/public/v3-operator:v3.0.1
158158
```
159159

160160
You can also build the docker image from source by cloning this repo and executing the following command from within
161161
the `v3-operator` folder:
162162

163163
```bash
164-
docker build --pull -t europe-west4-docker.pkg.dev/stakewiselabs/public/v3-operator:v3.0.0 .
164+
docker build --pull -t europe-west4-docker.pkg.dev/stakewiselabs/public/v3-operator:v3.0.1 .
165165
```
166166

167167
You will execute Operator Service commands using the format below (note the use of flags are optional):
@@ -170,7 +170,7 @@ You will execute Operator Service commands using the format below (note the use
170170
docker run --rm -ti \
171171
-u $(id -u):$(id -g) \
172172
-v ~/.stakewise/:/data \
173-
europe-west4-docker.pkg.dev/stakewiselabs/public/v3-operator:v3.0.0 \
173+
europe-west4-docker.pkg.dev/stakewiselabs/public/v3-operator:v3.0.1 \
174174
src/main.py COMMAND \
175175
--flagA=123 \
176176
--flagB=xyz
@@ -393,7 +393,7 @@ below:
393393
docker run --restart on-failure:10 \
394394
-u $(id -u):$(id -g) \
395395
-v ~/.stakewise/:/data \
396-
europe-west4-docker.pkg.dev/stakewiselabs/public/v3-operator:v3.0.0 \
396+
europe-west4-docker.pkg.dev/stakewiselabs/public/v3-operator:v3.0.1 \
397397
src/main.py start \
398398
--vault=0x3320ad928c20187602a2b2c04eeaa813fa899468 \
399399
--data-dir=/data \

operator.spec

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- mode: python ; coding: utf-8 -*-
2-
from PyInstaller.utils.hooks import collect_data_files
2+
from PyInstaller.utils.hooks import collect_data_files, collect_submodules
33
from sys import platform
44

55
datas = [
@@ -16,12 +16,23 @@ datas += collect_data_files('eth_utils')
1616

1717
block_cipher = None
1818

19+
hiddenimports=['multiaddr.codecs.uint16be', 'multiaddr.codecs.idna', 'pkg_resources.extern']
20+
21+
# tomli
22+
hiddenimports += [
23+
'ddc459050edb75a05942__mypyc', # MacOS
24+
'5bae8a57b5ef85818b48__mypyc', # Linux (both arm and amd64)
25+
'3c22db458360489351e4_myрус', # Windows
26+
'__future__'
27+
]
28+
hiddenimports += collect_submodules('tomli')
29+
1930
a = Analysis(
2031
['src/main.py'],
2132
pathex=[],
2233
binaries=[],
2334
datas=datas,
24-
hiddenimports=['multiaddr.codecs.uint16be', 'multiaddr.codecs.idna', 'pkg_resources.extern'],
35+
hiddenimports=hiddenimports,
2536
hookspath=[],
2637
hooksconfig={},
2738
runtime_hooks=[],

poetry.lock

Lines changed: 31 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "v3-operator"
3-
version = "v3.0.0"
3+
version = "v3.0.1"
44
description = "StakeWise operator service for registering vault validators"
55
authors = ["StakeWise Labs <info@stakewise.io>"]
66
package-mode = false
@@ -45,7 +45,7 @@ types-setuptools = "==70.0.0.20240524"
4545
flake8-newspaper-style = "==0.4.3"
4646

4747
[tool.poetry.group.build.dependencies]
48-
pyinstaller = "==5.13.2"
48+
pyinstaller = "==6.11.1"
4949

5050
[build-system]
5151
requires = ["poetry-core>=1.0.0"]

scripts/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ http_copy() {
281281
github_release() {
282282
owner_repo=$1
283283
version=$2
284-
test -z "$version" && version="v3.0.0"
284+
test -z "$version" && version="v3.0.1"
285285
giturl="https://github.com/${owner_repo}/releases/${version}"
286286
json=$(http_copy "$giturl" "Accept:application/json")
287287
test -z "$json" && return 1

0 commit comments

Comments
 (0)