Skip to content

Commit

Permalink
Docker fixes (#286)
Browse files Browse the repository at this point in the history 
* cve fix

* build fix changes

* fix not building windows

* fixed version requirements
  • Loading branch information
@Avi-Robusta
Avi-Robusta authored Jun 9, 2024
1 parent 2a28ef7 commit 71d6d76
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 59 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-on-release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,13 @@ jobs:
if: matrix.os == 'macos-latest'
shell: bash
run: |
pyinstaller --target-architecture universal2 krr.py
pyinstaller --target-architecture arm64 krr.py
mkdir -p ./dist/krr/grapheme/data
cp $(python -c "import grapheme; print(grapheme.__path__[0] + '/data/grapheme_break_property.json')") ./dist/krr/grapheme/data/grapheme_break_property.json
cp ./intro.txt ./dist/krr/intro.txt
- name: Build with PyInstaller
if: matrix.os == 'ubuntu-latest'
if: matrix.os != 'macos-latest'
shell: bash
run: |
pyinstaller krr.py
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/update-code-version.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ jobs:
- name: Extract version from tag
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV

- name: Fetch all branches
run: git fetch --all

- name: Select main branch
run: git checkout origin/main

Expand Down
8 changes: 4 additions & 4 deletions poetry.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ pandas = "2.2.2"
requests = "2.32.0"
pyyaml = "6.0.1"
typing-extensions = "4.6.0"
idna = "3.7"



Expand Down
106 changes: 53 additions & 53 deletions requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
about-time==4.2.1 ; python_version >= "3.9" and python_full_version <= "3.12.3"
alive-progress==3.1.5 ; python_version >= "3.9" and python_full_version <= "3.12.3"
boto3==1.34.62 ; python_version >= "3.9" and python_full_version <= "3.12.3"
botocore==1.34.62 ; python_version >= "3.9" and python_full_version <= "3.12.3"
cachetools==5.3.3 ; python_version >= "3.9" and python_full_version <= "3.12.3"
certifi==2024.2.2 ; python_version >= "3.9" and python_full_version <= "3.12.3"
charset-normalizer==3.3.2 ; python_version >= "3.9" and python_full_version <= "3.12.3"
click==8.1.7 ; python_version >= "3.9" and python_full_version <= "3.12.3"
colorama==0.4.6 ; python_version >= "3.9" and python_full_version <= "3.12.3"
commonmark==0.9.1 ; python_version >= "3.9" and python_full_version <= "3.12.3"
contourpy==1.2.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
cycler==0.12.1 ; python_version >= "3.9" and python_full_version <= "3.12.3"
dateparser==1.2.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
fonttools==4.49.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
google-auth==2.28.2 ; python_version >= "3.9" and python_full_version <= "3.12.3"
grapheme==0.6.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
httmock==1.4.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
idna==3.6 ; python_version >= "3.9" and python_full_version <= "3.12.3"
about-time==4.2.1 ; python_version >= "3.9" and python_full_version < "3.13"
alive-progress==3.1.5 ; python_version >= "3.9" and python_full_version < "3.13"
boto3==1.34.62 ; python_version >= "3.9" and python_full_version < "3.13"
botocore==1.34.62 ; python_version >= "3.9" and python_full_version < "3.13"
cachetools==5.3.3 ; python_version >= "3.9" and python_full_version < "3.13"
certifi==2024.2.2 ; python_version >= "3.9" and python_full_version < "3.13"
charset-normalizer==3.3.2 ; python_version >= "3.9" and python_full_version < "3.13"
click==8.1.7 ; python_version >= "3.9" and python_full_version < "3.13"
colorama==0.4.6 ; python_version >= "3.9" and python_full_version < "3.13"
commonmark==0.9.1 ; python_version >= "3.9" and python_full_version < "3.13"
contourpy==1.2.0 ; python_version >= "3.9" and python_full_version < "3.13"
cycler==0.12.1 ; python_version >= "3.9" and python_full_version < "3.13"
dateparser==1.2.0 ; python_version >= "3.9" and python_full_version < "3.13"
fonttools==4.49.0 ; python_version >= "3.9" and python_full_version < "3.13"
google-auth==2.28.2 ; python_version >= "3.9" and python_full_version < "3.13"
grapheme==0.6.0 ; python_version >= "3.9" and python_full_version < "3.13"
httmock==1.4.0 ; python_version >= "3.9" and python_full_version < "3.13"
idna==3.7 ; python_version >= "3.9" and python_full_version < "3.13"
importlib-resources==6.3.0 ; python_version >= "3.9" and python_version < "3.10"
jmespath==1.0.1 ; python_version >= "3.9" and python_full_version <= "3.12.3"
kiwisolver==1.4.5 ; python_version >= "3.9" and python_full_version <= "3.12.3"
kubernetes==26.1.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
matplotlib==3.8.3 ; python_version >= "3.9" and python_full_version <= "3.12.3"
numpy==1.26.4 ; python_version >= "3.9" and python_full_version <= "3.12.3"
oauthlib==3.2.2 ; python_version >= "3.9" and python_full_version <= "3.12.3"
packaging==24.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
pandas==2.2.2 ; python_version >= "3.9" and python_full_version <= "3.12.3"
pillow==10.3.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
prometheus-api-client==0.5.3 ; python_version >= "3.9" and python_full_version <= "3.12.3"
prometrix==0.1.17 ; python_version >= "3.9" and python_full_version <= "3.12.3"
pyasn1-modules==0.3.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
pyasn1==0.5.1 ; python_version >= "3.9" and python_full_version <= "3.12.3"
pydantic==1.10.15 ; python_version >= "3.9" and python_full_version <= "3.12.3"
pygments==2.17.2 ; python_version >= "3.9" and python_full_version <= "3.12.3"
pyparsing==3.1.2 ; python_version >= "3.9" and python_full_version <= "3.12.3"
python-dateutil==2.9.0.post0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
pytz==2024.1 ; python_version >= "3.9" and python_full_version <= "3.12.3"
pyyaml==6.0.1 ; python_version >= "3.9" and python_full_version <= "3.12.3"
regex==2023.12.25 ; python_version >= "3.9" and python_full_version <= "3.12.3"
requests-oauthlib==1.4.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
requests==2.32.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
rich==12.6.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
rsa==4.9 ; python_version >= "3.9" and python_full_version <= "3.12.3"
s3transfer==0.10.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
setuptools==69.2.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
shellingham==1.5.4 ; python_version >= "3.9" and python_full_version <= "3.12.3"
six==1.16.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
slack-sdk==3.27.1 ; python_version >= "3.9" and python_full_version <= "3.12.3"
typer[all]==0.7.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
typing-extensions==4.6.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
tzdata==2024.1 ; python_version >= "3.9" and python_full_version <= "3.12.3"
tzlocal==5.2 ; python_version >= "3.9" and python_full_version <= "3.12.3"
urllib3==1.26.18 ; python_version >= "3.9" and python_full_version <= "3.12.3"
websocket-client==1.7.0 ; python_version >= "3.9" and python_full_version <= "3.12.3"
jmespath==1.0.1 ; python_version >= "3.9" and python_full_version < "3.13"
kiwisolver==1.4.5 ; python_version >= "3.9" and python_full_version < "3.13"
kubernetes==26.1.0 ; python_version >= "3.9" and python_full_version < "3.13"
matplotlib==3.8.3 ; python_version >= "3.9" and python_full_version < "3.13"
numpy==1.26.4 ; python_version >= "3.9" and python_full_version < "3.13"
oauthlib==3.2.2 ; python_version >= "3.9" and python_full_version < "3.13"
packaging==24.0 ; python_version >= "3.9" and python_full_version < "3.13"
pandas==2.2.2 ; python_version >= "3.9" and python_full_version < "3.13"
pillow==10.3.0 ; python_version >= "3.9" and python_full_version < "3.13"
prometheus-api-client==0.5.3 ; python_version >= "3.9" and python_full_version < "3.13"
prometrix==0.1.17 ; python_version >= "3.9" and python_full_version < "3.13"
pyasn1-modules==0.3.0 ; python_version >= "3.9" and python_full_version < "3.13"
pyasn1==0.5.1 ; python_version >= "3.9" and python_full_version < "3.13"
pydantic==1.10.15 ; python_version >= "3.9" and python_full_version < "3.13"
pygments==2.17.2 ; python_version >= "3.9" and python_full_version < "3.13"
pyparsing==3.1.2 ; python_version >= "3.9" and python_full_version < "3.13"
python-dateutil==2.9.0.post0 ; python_version >= "3.9" and python_full_version < "3.13"
pytz==2024.1 ; python_version >= "3.9" and python_full_version < "3.13"
pyyaml==6.0.1 ; python_version >= "3.9" and python_full_version < "3.13"
regex==2023.12.25 ; python_version >= "3.9" and python_full_version < "3.13"
requests-oauthlib==1.4.0 ; python_version >= "3.9" and python_full_version < "3.13"
requests==2.32.0 ; python_version >= "3.9" and python_full_version < "3.13"
rich==12.6.0 ; python_version >= "3.9" and python_full_version < "3.13"
rsa==4.9 ; python_version >= "3.9" and python_full_version < "3.13"
s3transfer==0.10.0 ; python_version >= "3.9" and python_full_version < "3.13"
setuptools==69.2.0 ; python_version >= "3.9" and python_full_version < "3.13"
shellingham==1.5.4 ; python_version >= "3.9" and python_full_version < "3.13"
six==1.16.0 ; python_version >= "3.9" and python_full_version < "3.13"
slack-sdk==3.27.1 ; python_version >= "3.9" and python_full_version < "3.13"
typer[all]==0.7.0 ; python_version >= "3.9" and python_full_version < "3.13"
typing-extensions==4.6.0 ; python_version >= "3.9" and python_full_version < "3.13"
tzdata==2024.1 ; python_version >= "3.9" and python_full_version < "3.13"
tzlocal==5.2 ; python_version >= "3.9" and python_full_version < "3.13"
urllib3==1.26.18 ; python_version >= "3.9" and python_full_version < "3.13"
websocket-client==1.7.0 ; python_version >= "3.9" and python_full_version < "3.13"
zipp==3.18.0 ; python_version >= "3.9" and python_version < "3.10"

0 comments on commit 71d6d76

Please sign in to comment.