Skip to content

Commit 71d6d76

Browse files
Avi-RobustaAvi-Robusta
authored
Docker fixes (#286)
* cve fix * build fix changes * fix not building windows * fixed version requirements
1 parent 2a28ef7 commit 71d6d76

File tree

5 files changed

+63
-59
lines changed

5 files changed

+63
-59
lines changed

‎.github/workflows/build-on-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@ jobs:
8282
if: matrix.os == 'macos-latest'
8383
shell: bash
8484
run: |
85-
pyinstaller --target-architecture universal2 krr.py
85+
pyinstaller --target-architecture arm64 krr.py
8686
mkdir -p ./dist/krr/grapheme/data
8787
cp $(python -c "import grapheme; print(grapheme.__path__[0] + '/data/grapheme_break_property.json')") ./dist/krr/grapheme/data/grapheme_break_property.json
8888
cp ./intro.txt ./dist/krr/intro.txt
8989
9090
- name: Build with PyInstaller
91-
if: matrix.os == 'ubuntu-latest'
91+
if: matrix.os != 'macos-latest'
9292
shell: bash
9393
run: |
9494
pyinstaller krr.py

‎.github/workflows/update-code-version.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ jobs:
1818
- name: Extract version from tag
1919
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
2020

21+
- name: Fetch all branches
22+
run: git fetch --all
23+
2124
- name: Select main branch
2225
run: git checkout origin/main
2326

‎poetry.lock

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

‎pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ pandas = "2.2.2"
3636
requests = "2.32.0"
3737
pyyaml = "6.0.1"
3838
typing-extensions = "4.6.0"
39+
idna = "3.7"
3940

4041

4142

‎requirements.txt

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
1-
about-time==4.2.1 ; python_version >= "3.9" and python_full_version <= "3.12.3"
2-
alive-progress==3.1.5 ; python_version >= "3.9" and python_full_version <= "3.12.3"
3-
boto3==1.34.62 ; python_version >= "3.9" and python_full_version <= "3.12.3"
4-
botocore==1.34.62 ; python_version >= "3.9" and python_full_version <= "3.12.3"
5-
cachetools==5.3.3 ; python_version >= "3.9" and python_full_version <= "3.12.3"
6-
certifi==2024.2.2 ; python_version >= "3.9" and python_full_version <= "3.12.3"
7-
charset-normalizer==3.3.2 ; python_version >= "3.9" and python_full_version <= "3.12.3"
8-
click==8.1.7 ; python_version >= "3.9" and python_full_version <= "3.12.3"
9-
colorama==0.4.6 ; python_version >= "3.9" and python_full_version <= "3.12.3"
10-
commonmark==0.9.1 ; python_version >= "3.9" and python_full_version <= "3.12.3"
11-
contourpy==1.2.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
12-
cycler==0.12.1 ; python_version >= "3.9" and python_full_version <= "3.12.3"
13-
dateparser==1.2.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
14-
fonttools==4.49.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
15-
google-auth==2.28.2 ; python_version >= "3.9" and python_full_version <= "3.12.3"
16-
grapheme==0.6.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
17-
httmock==1.4.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
18-
idna==3.6 ; python_version >= "3.9" and python_full_version <= "3.12.3"
1+
about-time==4.2.1 ; python_version >= "3.9" and python_full_version < "3.13"
2+
alive-progress==3.1.5 ; python_version >= "3.9" and python_full_version < "3.13"
3+
boto3==1.34.62 ; python_version >= "3.9" and python_full_version < "3.13"
4+
botocore==1.34.62 ; python_version >= "3.9" and python_full_version < "3.13"
5+
cachetools==5.3.3 ; python_version >= "3.9" and python_full_version < "3.13"
6+
certifi==2024.2.2 ; python_version >= "3.9" and python_full_version < "3.13"
7+
charset-normalizer==3.3.2 ; python_version >= "3.9" and python_full_version < "3.13"
8+
click==8.1.7 ; python_version >= "3.9" and python_full_version < "3.13"
9+
colorama==0.4.6 ; python_version >= "3.9" and python_full_version < "3.13"
10+
commonmark==0.9.1 ; python_version >= "3.9" and python_full_version < "3.13"
11+
contourpy==1.2.0 ; python_version >= "3.9" and python_full_version < "3.13"
12+
cycler==0.12.1 ; python_version >= "3.9" and python_full_version < "3.13"
13+
dateparser==1.2.0 ; python_version >= "3.9" and python_full_version < "3.13"
14+
fonttools==4.49.0 ; python_version >= "3.9" and python_full_version < "3.13"
15+
google-auth==2.28.2 ; python_version >= "3.9" and python_full_version < "3.13"
16+
grapheme==0.6.0 ; python_version >= "3.9" and python_full_version < "3.13"
17+
httmock==1.4.0 ; python_version >= "3.9" and python_full_version < "3.13"
18+
idna==3.7 ; python_version >= "3.9" and python_full_version < "3.13"
1919
importlib-resources==6.3.0 ; python_version >= "3.9" and python_version < "3.10"
20-
jmespath==1.0.1 ; python_version >= "3.9" and python_full_version <= "3.12.3"
21-
kiwisolver==1.4.5 ; python_version >= "3.9" and python_full_version <= "3.12.3"
22-
kubernetes==26.1.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
23-
matplotlib==3.8.3 ; python_version >= "3.9" and python_full_version <= "3.12.3"
24-
numpy==1.26.4 ; python_version >= "3.9" and python_full_version <= "3.12.3"
25-
oauthlib==3.2.2 ; python_version >= "3.9" and python_full_version <= "3.12.3"
26-
packaging==24.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
27-
pandas==2.2.2 ; python_version >= "3.9" and python_full_version <= "3.12.3"
28-
pillow==10.3.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
29-
prometheus-api-client==0.5.3 ; python_version >= "3.9" and python_full_version <= "3.12.3"
30-
prometrix==0.1.17 ; python_version >= "3.9" and python_full_version <= "3.12.3"
31-
pyasn1-modules==0.3.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
32-
pyasn1==0.5.1 ; python_version >= "3.9" and python_full_version <= "3.12.3"
33-
pydantic==1.10.15 ; python_version >= "3.9" and python_full_version <= "3.12.3"
34-
pygments==2.17.2 ; python_version >= "3.9" and python_full_version <= "3.12.3"
35-
pyparsing==3.1.2 ; python_version >= "3.9" and python_full_version <= "3.12.3"
36-
python-dateutil==2.9.0.post0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
37-
pytz==2024.1 ; python_version >= "3.9" and python_full_version <= "3.12.3"
38-
pyyaml==6.0.1 ; python_version >= "3.9" and python_full_version <= "3.12.3"
39-
regex==2023.12.25 ; python_version >= "3.9" and python_full_version <= "3.12.3"
40-
requests-oauthlib==1.4.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
41-
requests==2.32.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
42-
rich==12.6.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
43-
rsa==4.9 ; python_version >= "3.9" and python_full_version <= "3.12.3"
44-
s3transfer==0.10.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
45-
setuptools==69.2.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
46-
shellingham==1.5.4 ; python_version >= "3.9" and python_full_version <= "3.12.3"
47-
six==1.16.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
48-
slack-sdk==3.27.1 ; python_version >= "3.9" and python_full_version <= "3.12.3"
49-
typer[all]==0.7.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
50-
typing-extensions==4.6.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
51-
tzdata==2024.1 ; python_version >= "3.9" and python_full_version <= "3.12.3"
52-
tzlocal==5.2 ; python_version >= "3.9" and python_full_version <= "3.12.3"
53-
urllib3==1.26.18 ; python_version >= "3.9" and python_full_version <= "3.12.3"
54-
websocket-client==1.7.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
20+
jmespath==1.0.1 ; python_version >= "3.9" and python_full_version < "3.13"
21+
kiwisolver==1.4.5 ; python_version >= "3.9" and python_full_version < "3.13"
22+
kubernetes==26.1.0 ; python_version >= "3.9" and python_full_version < "3.13"
23+
matplotlib==3.8.3 ; python_version >= "3.9" and python_full_version < "3.13"
24+
numpy==1.26.4 ; python_version >= "3.9" and python_full_version < "3.13"
25+
oauthlib==3.2.2 ; python_version >= "3.9" and python_full_version < "3.13"
26+
packaging==24.0 ; python_version >= "3.9" and python_full_version < "3.13"
27+
pandas==2.2.2 ; python_version >= "3.9" and python_full_version < "3.13"
28+
pillow==10.3.0 ; python_version >= "3.9" and python_full_version < "3.13"
29+
prometheus-api-client==0.5.3 ; python_version >= "3.9" and python_full_version < "3.13"
30+
prometrix==0.1.17 ; python_version >= "3.9" and python_full_version < "3.13"
31+
pyasn1-modules==0.3.0 ; python_version >= "3.9" and python_full_version < "3.13"
32+
pyasn1==0.5.1 ; python_version >= "3.9" and python_full_version < "3.13"
33+
pydantic==1.10.15 ; python_version >= "3.9" and python_full_version < "3.13"
34+
pygments==2.17.2 ; python_version >= "3.9" and python_full_version < "3.13"
35+
pyparsing==3.1.2 ; python_version >= "3.9" and python_full_version < "3.13"
36+
python-dateutil==2.9.0.post0 ; python_version >= "3.9" and python_full_version < "3.13"
37+
pytz==2024.1 ; python_version >= "3.9" and python_full_version < "3.13"
38+
pyyaml==6.0.1 ; python_version >= "3.9" and python_full_version < "3.13"
39+
regex==2023.12.25 ; python_version >= "3.9" and python_full_version < "3.13"
40+
requests-oauthlib==1.4.0 ; python_version >= "3.9" and python_full_version < "3.13"
41+
requests==2.32.0 ; python_version >= "3.9" and python_full_version < "3.13"
42+
rich==12.6.0 ; python_version >= "3.9" and python_full_version < "3.13"
43+
rsa==4.9 ; python_version >= "3.9" and python_full_version < "3.13"
44+
s3transfer==0.10.0 ; python_version >= "3.9" and python_full_version < "3.13"
45+
setuptools==69.2.0 ; python_version >= "3.9" and python_full_version < "3.13"
46+
shellingham==1.5.4 ; python_version >= "3.9" and python_full_version < "3.13"
47+
six==1.16.0 ; python_version >= "3.9" and python_full_version < "3.13"
48+
slack-sdk==3.27.1 ; python_version >= "3.9" and python_full_version < "3.13"
49+
typer[all]==0.7.0 ; python_version >= "3.9" and python_full_version < "3.13"
50+
typing-extensions==4.6.0 ; python_version >= "3.9" and python_full_version < "3.13"
51+
tzdata==2024.1 ; python_version >= "3.9" and python_full_version < "3.13"
52+
tzlocal==5.2 ; python_version >= "3.9" and python_full_version < "3.13"
53+
urllib3==1.26.18 ; python_version >= "3.9" and python_full_version < "3.13"
54+
websocket-client==1.7.0 ; python_version >= "3.9" and python_full_version < "3.13"
5555
zipp==3.18.0 ; python_version >= "3.9" and python_version < "3.10"

0 commit comments

Comments
 (0)