From f0365e27cf52cd213d41a0d79bd474b3a341f56c Mon Sep 17 00:00:00 2001 From: "avi@robusta.dev" Date: Sun, 9 Jun 2024 13:08:25 +0300 Subject: [PATCH 1/4] cve fix --- poetry.lock | 8 ++++---- pyproject.toml | 1 + requirements.txt | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index a8f78d2f..262f4add 100644 --- a/poetry.lock +++ b/poetry.lock @@ -531,13 +531,13 @@ requests = ">=1.0.0" [[package]] name = "idna" -version = "3.6" +version = "3.7" description = "Internationalized Domain Names in Applications (IDNA)" optional = false python-versions = ">=3.5" files = [ - {file = "idna-3.6-py3-none-any.whl", hash = "sha256:c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f"}, - {file = "idna-3.6.tar.gz", hash = "sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca"}, + {file = "idna-3.7-py3-none-any.whl", hash = "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0"}, + {file = "idna-3.7.tar.gz", hash = "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc"}, ] [[package]] @@ -1913,4 +1913,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.9,<=3.12.3" -content-hash = "22de259effaf2739aa45bfbe29b6b07d287e335eed12f183fd76a18b67099e6c" +content-hash = "0635821f6953d2c4085dc5ad44413fc8d39bb0e861f8b88d6f02f5535fcf8f89" diff --git a/pyproject.toml b/pyproject.toml index 0c73c649..518b39c6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,6 +36,7 @@ pandas = "2.2.2" requests = "2.32.0" pyyaml = "6.0.1" typing-extensions = "4.6.0" +idna = "3.7" diff --git a/requirements.txt b/requirements.txt index d9989a3f..4cdce2ff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ 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" +idna==3.7 ; python_version >= "3.9" and python_full_version <= "3.12.3" 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" From 151b1b65463ca6a8230d106b2f079318f6473db9 Mon Sep 17 00:00:00 2001 From: "avi@robusta.dev" Date: Sun, 9 Jun 2024 13:15:56 +0300 Subject: [PATCH 2/4] build fix changes --- .github/workflows/build-on-release.yml | 2 +- .github/workflows/update-code-version.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-on-release.yml b/.github/workflows/build-on-release.yml index d8a91237..276eafa7 100644 --- a/.github/workflows/build-on-release.yml +++ b/.github/workflows/build-on-release.yml @@ -82,7 +82,7 @@ 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 diff --git a/.github/workflows/update-code-version.yml b/.github/workflows/update-code-version.yml index bc0087da..91ba7819 100644 --- a/.github/workflows/update-code-version.yml +++ b/.github/workflows/update-code-version.yml @@ -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 From 5efaf59e21c1b1a7c5377ffaae3a56345c7a1db8 Mon Sep 17 00:00:00 2001 From: avi robusta Date: Sun, 9 Jun 2024 13:38:49 +0300 Subject: [PATCH 3/4] fix not building windows --- .github/workflows/build-on-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-on-release.yml b/.github/workflows/build-on-release.yml index 276eafa7..7289a973 100644 --- a/.github/workflows/build-on-release.yml +++ b/.github/workflows/build-on-release.yml @@ -88,7 +88,7 @@ jobs: 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 From 2f7e887c1eba6b5ce78d4019ef534c4316710e69 Mon Sep 17 00:00:00 2001 From: avi robusta Date: Sun, 9 Jun 2024 14:45:15 +0300 Subject: [PATCH 4/4] fixed version requirements --- requirements.txt | 106 +++++++++++++++++++++++------------------------ 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4cdce2ff..7a6e4eb5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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.7 ; 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"