From 232e1aba3cd9a7505861d46ca41493c70e94c3f0 Mon Sep 17 00:00:00 2001 From: Li Wan Date: Wed, 20 Nov 2024 16:37:59 +1100 Subject: [PATCH 1/7] Remove nltk punkt --- scripts/install_punkt_tokenizers.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/install_punkt_tokenizers.sh b/scripts/install_punkt_tokenizers.sh index 0970e6e..6c185e5 100644 --- a/scripts/install_punkt_tokenizers.sh +++ b/scripts/install_punkt_tokenizers.sh @@ -1,13 +1,9 @@ #!/bin/bash -# This script is meant to be run at buildtime. +# This script is meant to be run at build time. set -euo pipefail set -x mkdir -p /root/nltk_data/tokenizers -curl https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/tokenizers/punkt.zip -o /root/nltk_data/tokenizers/punkt.zip -unzip /root/nltk_data/tokenizers/punkt.zip -d /root/nltk_data/tokenizers/ -rm /root/nltk_data/tokenizers/punkt.zip - curl https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/tokenizers/punkt_tab.zip -o /root/nltk_data/tokenizers/punkt_tab.zip unzip /root/nltk_data/tokenizers/punkt_tab.zip -d /root/nltk_data/tokenizers/ rm /root/nltk_data/tokenizers/punkt_tab.zip From 520f6bad14a02ab5e6ba7bf6b6bf828414c249b2 Mon Sep 17 00:00:00 2001 From: Li Wan Date: Wed, 20 Nov 2024 16:41:39 +1100 Subject: [PATCH 2/7] Lock portalocker==2.10.1 version, it has a new release portalocker==3.0.0 --- requirements/requirements.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements/requirements.in b/requirements/requirements.in index 5d6671b..367236f 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -95,4 +95,5 @@ uvloop==0.20.0 watchfiles==0.24.0 websockets==13.1 zipp==3.20.2 -yarl==1.13.1 \ No newline at end of file +yarl==1.13.1 +portalocker==2.10.1 \ No newline at end of file From 465f4b09f168f1a34c41f801b05272ca21b50b3e Mon Sep 17 00:00:00 2001 From: Li Wan Date: Wed, 20 Nov 2024 16:47:35 +1100 Subject: [PATCH 3/7] chnge to pull_request --- .github/workflows/check_requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_requirements.yml b/.github/workflows/check_requirements.yml index 3a96806..8baf108 100644 --- a/.github/workflows/check_requirements.yml +++ b/.github/workflows/check_requirements.yml @@ -6,7 +6,7 @@ on: push: branches: - main - pull_request_target: + pull_request: branches: - main From 1bfee8e8255c44aae3ebdadd0226e566e1204eae Mon Sep 17 00:00:00 2001 From: Li Wan Date: Wed, 20 Nov 2024 16:50:07 +1100 Subject: [PATCH 4/7] Test runs --- requirements/arm64-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/arm64-requirements.txt b/requirements/arm64-requirements.txt index 0794d3d..ed2eeb5 100644 --- a/requirements/arm64-requirements.txt +++ b/requirements/arm64-requirements.txt @@ -481,4 +481,4 @@ zipp==3.20.2 # via # -r requirements.in # importlib-metadata - # importlib-resources + # importlib-resources \ No newline at end of file From 90ec42d1ddccce28ea85e6da553b3223def40718 Mon Sep 17 00:00:00 2001 From: Li Wan Date: Wed, 20 Nov 2024 16:57:09 +1100 Subject: [PATCH 5/7] Test --- .github/workflows/check_requirements.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check_requirements.yml b/.github/workflows/check_requirements.yml index 8baf108..45a2174 100644 --- a/.github/workflows/check_requirements.yml +++ b/.github/workflows/check_requirements.yml @@ -5,8 +5,11 @@ on: workflow_dispatch: push: branches: - - main + - main # Trigger when a PR is merged into main pull_request: + types: + - synchronize # When changes are pushed to a PR targeting main + - opened # When a PR targeting main is created branches: - main From 23bed293c62c7c865ded70a760a2fe3afd40bc8e Mon Sep 17 00:00:00 2001 From: Li Wan Date: Wed, 20 Nov 2024 16:57:50 +1100 Subject: [PATCH 6/7] Test it --- .github/workflows/check_requirements.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/check_requirements.yml b/.github/workflows/check_requirements.yml index 45a2174..8abb350 100644 --- a/.github/workflows/check_requirements.yml +++ b/.github/workflows/check_requirements.yml @@ -3,15 +3,9 @@ name: Check the dependencies in requirements.in and requirements.txt on: workflow_call: workflow_dispatch: - push: - branches: - - main # Trigger when a PR is merged into main pull_request: - types: - - synchronize # When changes are pushed to a PR targeting main - - opened # When a PR targeting main is created branches: - - main + - main # Trigger when a PR is merged into main concurrency: group: check-requirements-${{ github.head_ref || github.ref }} From b82084343a83d38fea606636d6a9dd2d72f7c405 Mon Sep 17 00:00:00 2001 From: Li Wan Date: Wed, 20 Nov 2024 16:58:43 +1100 Subject: [PATCH 7/7] Fix it --- .github/workflows/check_requirements.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check_requirements.yml b/.github/workflows/check_requirements.yml index 8abb350..4313b09 100644 --- a/.github/workflows/check_requirements.yml +++ b/.github/workflows/check_requirements.yml @@ -5,7 +5,10 @@ on: workflow_dispatch: pull_request: branches: - - main # Trigger when a PR is merged into main + - main + push: + branches: + - main concurrency: group: check-requirements-${{ github.head_ref || github.ref }}